Re: [PATCH 1/3] wt-status: Make status messages more consistent with others

2014-03-17 Thread Junio C Hamano
Andrew Wong andrew.k...@gmail.com writes: This is mainly changing messages that say: run git foo --bar to use git foo --bar to baz git foo --bar is fine, but to baz was hard to read without first realizing that 'baz' stands for some/any verb. I think rephrasing it to use

Re: [PATCH 3/3] reset: Print a warning when user uses git reset during a merge

2014-03-17 Thread Junio C Hamano
Andrew Wong andrew.k...@gmail.com writes: During a merge, --mixed is most likely not what the user wants. Using --mixed during a merge would leave the merged changes and new files mixed in with the local changes. The user would have to manually clean up the work tree, which is non-trivial. In

Re: [PATCH 2/3] merge: Advise user to use git merge --abort to abort merges

2014-03-17 Thread Junio C Hamano
Andrew Wong andrew.k...@gmail.com writes: Print message during git merge and git status. Add a new mergeHints advice to silence these messages. This sounds sensible. Don't we want to have this one take effect on the places where advice.resolveConflict is used in git-pull? I.e. something

Re: [PATCH] index-pack: do not segfault when keep_name is NULL

2014-03-17 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: keep_name is used to print error messages a couple lines down. Reset it to the real path returned by odb_pack_keep() if it's set to NULL by caller. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- One of these moments I will make

Re: [PATCH 4/4] gc --aggressive: three phase repacking

2014-03-17 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: As explained in the previous commit,... [PATCH 3/4] becomes a commit with an empty log message for some reason. Have you tried running am -s on it? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH] Documentation/gitk: Document new config file location

2014-03-17 Thread Junio C Hamano
Astril Hayato astrilhay...@gmail.com writes: User configuration file is now stored at $XDG_CONFIG_HOME/git/gitk Signed-off-by: Astril Hayato astrilhay...@gmail.com --- Documentation/gitk.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/gitk.txt

Re: [PATCH] Add grep.fullName config variable

2014-03-17 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: This configuration variable sets the default for the --full-name option. Signed-off-by: Andreas Schwab sch...@linux-m68k.org --- Would this change break Porcelains (e.g. Emacs modes) and force them to be updated to explicitly pass --no-full-name

Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()

2014-03-17 Thread Junio C Hamano
Hiroyuki Sano sh19910...@gmail.com writes: Including dir.h in diff-no-index.c, it causes a compile error, because the same name function read_directory() is declared globally in dir.h. This change is to avoid conflicts as above. Signed-off-by: Hiroyuki Sano sh19910...@gmail.com ---

Re: [PATCH 3/3][GSOC] fsck: use is_dot_or_dotdot() instead of strcmp()

2014-03-17 Thread Junio C Hamano
Hiroyuki Sano sh19910...@gmail.com writes: The is_dot_or_dotdot() is used to check if the string is either . or ... Signed-off-by: Hiroyuki Sano sh19910...@gmail.com --- fsck.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fsck.c b/fsck.c index

Re: [PATCH 1/1] general style: replaces memcmp() with starts_with()

2014-03-17 Thread Junio C Hamano
Quint Guvernator quintus.pub...@gmail.com writes: memcmp() is replaced with negated starts_with() when comparing strings from the beginning and when it is logical to do so. starts_with() looks nicer and it saves the extra argument of the length of the comparing string. Signed-off-by: Quint

Re: [PATCH 0/3] Make git more user-friendly during a merge conflict

2014-03-17 Thread Junio C Hamano
Andrew Wong andrew.k...@gmail.com writes: 2/3: I've added advice.mergeHints to silent the messages that suggests git merge--abort. 3/3: I've added a warning message when users used git reset during a merge. This warning will be printed if the user is in the middle of a merge. In future

Re: [PATCH 1/1] general style: replaces memcmp() with starts_with()

2014-03-17 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Mar 17, 2014 at 03:52:51PM -0700, Junio C Hamano wrote: diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 3e1d5c3..4135980 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -193,7 +193,7 @@ static int

Re: [PATCH 4/4] gc --aggressive: three phase repacking

2014-03-17 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Tue, Mar 18, 2014 at 5:12 AM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: As explained in the previous commit,... [PATCH 3/4] becomes a commit with an empty log message for some reason. Have you tried

Re: [PATCH] Add grep.fullName config variable

2014-03-18 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: Yes, that would be required. On the other hand, currently it is impossible to cut-n-paste a file name without --full-name, since the pager is always started in top-level. Perhaps it is better to fix the latter? So far we never cared where the

Re: [PATCH v3] test-lib.sh: do not echo externally supplied strings

2014-03-18 Thread Junio C Hamano
. Signed-off-by: Uwe Storbeck u...@ibr.ch --- Commit message rewritten to avoid title continuation in the body. Thanks Junio C Hamano for the hint. Here is what I queued yesterday. I was wrong to say control characters; a backslash sequence is not necessarily a control character (e.g. \c

Re: [PATCH 1/1] general style: replaces memcmp() with starts_with()

2014-03-18 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: A patch of this nature doesn't require much more description than stating what it does (replace memcmp() with starts_with()) and why (improve code clarity). The following rewrite might be sufficient: Subject: replace memcmp() with

Re: [GSoC14][RFC] Is there any interest in adding a port of checkpatch.pl to contrib/?

2014-03-18 Thread Junio C Hamano
Jacopo Notarstefano jacopo.notarstef...@gmail.com writes: It seems to me that the topic of adding the checkpatch.pl script to Git's source tree has cropped up several times in the past, as recently as a couple of days ago: $gmane/243607. It should be noted that its usage for its sake has

Re: [PATCH] git-rebase: Teach rebase - shorthand.

2014-03-18 Thread Junio C Hamano
Brian Gesiak modoca...@gmail.com writes: Teach rebase the same shorthand as checkout and merge; that is, that - means the branch we were previously on. Reported-by: Tim Chase g...@tim.thechases.com Signed-off-by: Brian Gesiak modoca...@gmail.com --- git-rebase.sh | 4

Re: [PATCH][GSOC2014] add: Rewrite run_add_interactive to use struct argv_array

2014-03-18 Thread Junio C Hamano
Movchan Pavel movchan...@gmail.com writes: Origin code are code with own realisation argv array editing. It was changed, and code modified for using unified argv-array realisation from argv-array.h. Commit for Google Summer of Code 2014 Signed-off-by: Movchan Pavel movchan...@gmail.com ---

Re: Git won Linux Magazine's Linux New Media Award in the category Outstanding Contribution to Open Source/Linux/Free Software

2014-03-18 Thread Junio C Hamano
Richard Hartmann richih.mailingl...@gmail.com writes: Dear all, Git won an award in the main category of the English German Linux Magazine at CeBIT, this year. Jens Lehmann, Heiko Voigt, and myself were present to accept the award on behalf of the Git community as a whole. You can find a

Re: [PATCH] Add grep.fullName config variable

2014-03-18 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: Junio C Hamano gits...@pobox.com writes: Don't we have the exact same issue for the editor, by the way? Shouldn't we be running it in the original subdirectory as well? It's called with an absolute name, so it shouldn't care. But we should

Re: [PATCH v2] tests: set temp variables using 'env' in test function instead of subshell

2014-03-18 Thread Junio C Hamano
David Tran unsignedz...@gmail.com writes: Originally, the code used subshells instead of FOO=BAR command because the variable would otherwise leak into the surrounding context of the POSIX shell when 'command' is a shell function. The subshell was used to hold the context for the test. Using

[ANNOUNCE] Git v1.9.1

2014-03-18 Thread Junio C Hamano
not segfault on gmtime errors remote: handle pushremote config in any order show_ident_date: fix tz range check clean: respect pathspecs with -d clean: simplify dir/not-dir logic Junio C Hamano (4): t0003: do not chdir the whole test process check-attr: move

Re: [PATCH v2] tests: set temp variables using 'env' in test function instead of subshell

2014-03-18 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Mar 18, 2014 at 01:37:39PM -0700, Junio C Hamano wrote: diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index c9c426c..3e3f77b 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -974,24 +974,15

Re: [PATCH] mv: prevent mismatched data when ignoring errors.

2014-03-18 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: I had recently been thinking along the same lines. In many of the potential callers that I noticed, ALLOC_GROW() was used immediately before making space in the array for a new element. So I suggest something more like +#define

Re: [PATCH 4/7] commit: fix patch hunk editing with commit -p -m

2014-03-19 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: +int run_hook_with_custom_index(const char *index_file, const char *name, ...) +{ +const char *hook_env[3] = { NULL }; +char index[PATH_MAX]; Sorry being late with the review. Recently some effort has been put to replace the

Re: [PATCH] test-lib.sh: use printf instead of echo

2014-03-19 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Uwe Storbeck wrote: + printf '%s\n' $@ | sed -e 's/^/# /' This is wrong, isn't it? Why do we want one line per item here? Yes, Hannes caught the same, too. Sorry for the sloppiness. We currently use echo all over

Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()

2014-03-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Hiroyuki Sano sh19910...@gmail.com writes: Including dir.h in diff-no-index.c, it causes a compile error, because the same name function read_directory() is declared globally in dir.h. This change is to avoid conflicts as above. Signed-off

Re: [PATCH v2] tests: set temp variables using 'env' in test function instead of subshell

2014-03-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Mar 18, 2014 at 03:16:27PM -0700, Junio C Hamano wrote: Isn't GIT_CONFIG here another way of saying: test_must_fail git config -f doesnotexist --list Perhaps that is shorter and more readable still (and there are a few similar cases

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
branch Teach rebase the same shorthand as checkout and merge to name the branch to rebase the current branch on; that is, that - means the branch we were previously on. Requested-by: Tim Chase g...@tim.thechases.com Signed-off-by: Brian Gesiak modoca...@gmail.com Signed-off-by: Junio C Hamano gits

Re: [PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()

2014-03-19 Thread Junio C Hamano
Brian Bourn ba.bo...@gmail.com writes: It would be desirable to replace manual checking of . or .. in diff-no-index.c with is_dot_or_dotdot(), which is defined in dir.h, however, dir.h declares a read_directory() which conflicts with a (different) static read_directory() defined in

Re: [PATCH v2 3/3][GSOC] fsck: replace if-statements to logical expressions

2014-03-19 Thread Junio C Hamano
Hiroyuki Sano sh19910...@gmail.com writes: There were two different ways to check flag values, one way is using if-statement, and the other way is using logical expression. To make sensible, replace if-statements to logical expressions in fsck_tree(). The change described by these two

Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()

2014-03-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: -static int read_directory(const char *path, struct string_list *list) +static int get_directory_list(const char *path, struct string_list *list) Renaming is a good idea but the new name sounds like you are grabbing the names of directories, ignoring

Re: [PATCH] rev-parse --parseopt: option argument name hints

2014-03-19 Thread Junio C Hamano
): Ilya Bobyr ilya.bo...@gmail.com writes: On 3/11/2014 12:10 PM, Junio C Hamano wrote: Documentation on the whole argument parsing is quite short, so,... ... I though that an example just to describe `argh' while useful would look a bit disproportional, compared

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First, rewinding head to replay your work on top of it... Fast-forwarded HEAD to @{-1}. instead of Fast

Re: [PATCH] test-lib.sh: use printf instead of echo

2014-03-19 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Uwe Storbeck wrote: +printf '%s\n' $@ | sed -e 's/^/# /' This is wrong, isn't it? Why do we want one line per item here? Yes

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First

Re: [PATCH v3] tests: use env to run commands with temporary env-var settings

2014-03-19 Thread Junio C Hamano
David Tran unsignedz...@gmail.com writes: Originally, we would use VAR=VAL command to execute a test command with environment variable(s) only for that command. This does not work for commands that are shell functions (most notably test functions like test_must_fail); the result of the

Re: What's cooking in git.git (Mar 2014, #03; Fri, 14)

2014-03-19 Thread Junio C Hamano
Max Horn m...@quendi.de writes: On 17.03.2014, at 18:01, Junio C Hamano gits...@pobox.com wrote: Torsten Bögershausen tbo...@web.de writes: On 2014-03-14 23.09, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit - remote-hg: do not fail on invalid bookmarks

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Junio C Hamano
sza...@chromium.org writes: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. According to the ReadFile spec, using the 'overlapped' argument should not affect the implicit position pointer of the

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: I thought your suggestion was: 'rebase @{-1}' says 'Fast-fowarded HEAD to @{-1}'. It should say 'Fast-forwarded HEAD to 4f407407 (rebase: allow - short-hand for the previous branch, 2014-03-19)' instead. Or it could be: 'rebase

Re: [PATCH] t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

2014-03-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: Hi Sebastian, On Wed, 19 Mar 2014, Sebastian Schuberth wrote: On MINGW, pwd is defined as pwd -W in test-lib.sh. This usually is the right thing, but the absolute Windows path with a colon confuses rsync. We could use $PWD in this case

Re: [PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-19 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: The default of 16MiB causes serious thrashing for large delta chains combined with large files. Signed-off-by: David Kastrup d...@gnu.org --- Is that a good argument? Wouldn't the default of 128MiB burden smaller machines with bloated processes? Forgot

Re: [RFC][GSoC] Calling for comments regarding rough draft of proposal

2014-03-19 Thread Junio C Hamano
tanay abhra tanay...@gmail.com writes: 2.Other things I should add to the proposal that I have left off?I am getting confused what extra details I should add to the proposal. I will add the informal parts(my background, schedule for summer etc) of the proposal later. I would not label the

Re: [PATCH v2] remote-hg: do not fail on invalid bookmarks

2014-03-19 Thread Junio C Hamano
Max Horn m...@quendi.de writes: Mercurial can have bookmarks pointing to nullid (the empty root revision), while Git can not have references to it. When cloning or fetching from a Mercurial repository that has such a bookmark, the import will fail because git-remote-hg will not be able to

Re: [PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-19 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: David Kastrup d...@gnu.org writes: The default of 16MiB causes serious thrashing for large delta chains combined with large files. Signed-off-by: David Kastrup d...@gnu.org --- Is that a good argument

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Junio C Hamano
sza...@chromium.org (Stefan Zager) writes: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. According to the ReadFile spec, using the 'overlapped' argument should not affect the implicit position pointer

Re: [PATCH 0/3] Make git more user-friendly during a merge conflict

2014-03-19 Thread Junio C Hamano
Andrew Wong andrew.k...@gmail.com writes: On Mon, Mar 17, 2014 at 7:04 PM, Junio C Hamano gits...@pobox.com wrote: Has this series been tested with existing test suite? ... I tested it during RFC, but missed it when I sent it as patch. ... I'll fix the problem. Sorry about that. Thanks

Re: [PATCH] disable grafts during fetch/push/bundle

2014-03-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Mar 07, 2014 at 08:08:37AM +0100, Christian Couder wrote: Be it graft or replace, I do not think we want to invite people to use these mechansims too lightly to locally rewrite their history willy-nilly without fixing their mistakes at the object

Re: git 1.9.1 tarball

2014-03-20 Thread Junio C Hamano
Jason St. John jstj...@purdue.edu writes: On Wed, Mar 19, 2014 at 8:09 PM, 乙酸鋰 ch3co...@gmail.com wrote: Hi, Where to find git 1.9.1 tarball? It is not uploaded to google code. -- You can download a tarball for 1.9.1 from GitHub: https://github.com/git/git/archive/v1.9.1.tar.gz Jason

Re: [PATCH] test-lib.sh: use printf instead of echo

2014-03-20 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: ... I am a bit reluctant to name the helper sane_echo to declare echo that interprets backslashes in the string is insane, though. For these print a single line uses, we are only interested in using a subset of the features

Re: Configuring a third-party git hook

2014-03-20 Thread Junio C Hamano
Chris Angelico ros...@gmail.com writes: file. It doesn't really care about the full history, and wants to be reasonably fast (as the user is waiting for it). It's just a convenience, so correctness isn't a huge issue. The easiest way to keep it moving through quickly is to limit the search:

Re: [PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-20 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Thu, Mar 20, 2014 at 5:11 AM, Junio C Hamano gits...@pobox.com wrote: ... I know that the 512MiB default for the bitFileThreashold (aka forget about delta compression) came out of thin air. It was just 1GB is always too huge for anybody, so let's cut

Re: [PATCH] diff: optimise parse_dirstat_params() to only compare strings when necessary

2014-03-20 Thread Junio C Hamano
Dragos Foianu dragos.foi...@gmail.com writes: parse_dirstat_params() goes through a chain of if statements using strcmp to parse parameters. When the parameter is a digit, the value must go through all comparisons before the function realises it is a digit. Optimise this logic by only going

Re: [GSOC 2014]idea:Git Configuration API Improvement

2014-03-20 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Why? (In general, explaining why you chose something is more important than explaining what you chose) Good educational comment. Thanks. A tree (AST, Abstract syntax tree) can be interesting if you have some source-to-source

Re: [PATCH 3/8] ls_colors.c: enable coloring on u+x files

2014-03-20 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Thu, Mar 20, 2014 at 6:46 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: git-compat-util.h does not seem to carry S_IXUGO. Anyway as far as Git is concerned, we only care one executable bit. Hard

Re: [PATCH] status: disable translation when --porcelain is used

2014-03-20 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: git status --branch --porcelain displays the status of the branch (ahead, behind, gone), and used gettext to translate the string. Use hardcoded strings when --porcelain is used, but keep the gettext translation for git status --short which is

Re: [PATCH v3] Documentation/gitk: Document new config file location

2014-03-20 Thread Junio C Hamano
Astril Hayato astrilhay...@gmail.com writes: User config file location now complies with the XDG base directory specification Signed-off-by: Astril Hayato astrilhay...@gmail.com --- Documentation/gitk.txt | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git

Re: [PATCH v3][GSOC] fsck: use bitwise-or assignment operator to set flag

2014-03-20 Thread Junio C Hamano
Hiroyuki Sano sh19910...@gmail.com writes: fsck_tree() has two different ways to set a flag, which are the followings: 1. Using a if-statement that guards assignment. 2. Using a bitwise-or assignment operator. Currently, many with the former way, and one with the latter way. In

Re: [PATCH v3] rev-parse --parseopt: option argument name hints

2014-03-20 Thread Junio C Hamano
Ilya Bobyr ilya.bo...@gmail.com writes: Built-in commands can specify names for option arguments when usage text is generated for a command. sh based commands should be able to do the same. Option argument name hint is any text that comes after [*=?!] after the argument name up to the

Re: [PATCH v3][GSOC] fsck: use bitwise-or assignment operator to set flag

2014-03-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: In other words, it is brief and to the point merely _allows_ these statements to be expressed in the latter form; it does not say anything about which is better between the former and the latter. In any case, that is a minor point. I'll queue

Re: [PATCH v3 2/2] log: add --show-linear-break to help see non-linear history

2014-03-20 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Option explanation is in rev-list-options.txt. The interaction with -z is left undecided. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Thanks. * Revert back to the old option name --show-linear-break * Get rid of

Re: [PATCH] Make XDF_NEED_MINIMAL default in blame.

2014-03-20 Thread Junio C Hamano
Michael Andreen h...@ruin.nu writes: There hasn't been any arguments against this patch. Just updated the message with a note about --no-minimal. There hasn't been any argument for this patch, either. It is not like we are still in year 2007; timing result in a small project like Git itself

Re: [PATCH] configure.ac: link with -liconv for locale_charset()

2014-03-20 Thread Junio C Hamano
Дилян Палаузов dilyan.palau...@aegee.org writes: diff --git a/Makefile b/Makefile index dddaf4f..dce4694 100644 --- a/Makefile +++ b/Makefile @@ -59,9 +59,9 @@ all:: # FreeBSD can use either, but MinGW and some others need to use # libcharset.h's locale_charset() instead. # -# Define

Re: What's cooking in git.git (Mar 2014, #04; Thu, 20)

2014-03-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Quite a few topics are still outside 'pu' and I suspect some of the larger ones deserve deeper reviews to help moving them to 'next'. In principle, I'd prefer to keep any large topic that touch core part of the system cooking in 'next' for at least

Re: [PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-20 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: Duy Nguyen pclo...@gmail.com writes: The only downside I see is large blobs will be packed undeltified, which could increase pack size if you have lots of them. I think that is something that can be tweaked

Re: What's cooking in git.git (Mar 2014, #04; Thu, 20)

2014-03-20 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 03/20/2014 10:09 PM, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-03-19) 1 commit - remote-hg: do not fail on invalid bookmarks Will merge to 'next'. Hmm, am I the only one who has 11 failures in test-hg-hg-git.sh, Still

Re: [PATCHv2] branch.c: simplify chain of if statements

2014-03-21 Thread Junio C Hamano
Dragos Foianu dragos.foi...@gmail.com writes: I'm not sure it's worth pursuing the table approach further, especially since a solution has already been accepted and merged into the codebase. Yes. I would further say that you already qualify as having finished a microproject, if I were a part

Re: [PATCH v5] use starts_with() instead of !memcmp()

2014-03-21 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: On Tue, Mar 18, 2014 at 9:18 PM, Quint Guvernator quintus.pub...@gmail.com wrote: Another version, this time very in line with the review and commentary of Junio, Eric, and Michael. This version boasts a revamped commit message and fewer but

Re: [PATCH v3] rev-parse --parseopt: option argument name hints

2014-03-21 Thread Junio C Hamano
Ilya Bobyr ilya.bo...@gmail.com writes: + `arg_hing`, if specified, is used as a name of the argument in the + help output, for options that take arguments. `arg_hint` is + terminated by the first whitespace. When output the name is shown in + angle braces. Underscore symbols are

Re: [PATCH][GSOC] Selection of the verbose message is replaced with generated message in install_branch_config()

2014-03-21 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: Sorry, you're right about message[0] case not being a crasher (though the assert() still seems overkill). Assert() often becomes no-op in production build. I think this may be an indication that table-driven may not be as good an approach as many

Re: Configuring a third-party git hook

2014-03-21 Thread Junio C Hamano
-- From: Chris Angelico ros...@gmail.com Date: Fri, 21 Mar 2014 15:07:08 +1100 Subject: [PATCH] config.txt: third-party tools may and do use their own variables Signed-off-by: Chris Angelico ros...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/config.txt | 9 +++-- 1

Re: [PATCH] status: disable translation when --porcelain is used

2014-03-21 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: diff --git a/wt-status.c b/wt-status.c index a452407..e55e5b9 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1509,19 +1509,23 @@ static void wt_shortstatus_print_tracking(struct wt_status *s

Re: [RFC] [GSoC] Draft of Proposal for GSoC

2014-03-21 Thread Junio C Hamano
Brian Bourn ba.bo...@gmail.com writes: Something like this? Sample api calls Add_Opt_Group() Parse_with_contains() Parse_with_merged() Parse_with_no_merged() Parse_with_formatting() (each of the 4 calls above may have internal calls within the library in order to parse the option for

Re: [PATCH 3/4] Fix misuses of nor in comments

2014-03-21 Thread Junio C Hamano
Justin Lebar jle...@google.com writes: Thanks for the quick reply. When I send a new patch, should I fold these changes into the original commit, or should I send them as a separate commit? diff --git a/builtin/apply.c b/builtin/apply.c index b0d0986..6013e19 100644 --- a/builtin/apply.c

Re: [PATCH 3/4] Fix misuses of nor in comments

2014-03-21 Thread Junio C Hamano
Justin Lebar jle...@google.com writes: Thanks for the quick reply. When I send a new patch, should I fold these changes into the original commit, or should I send them as a separate commit? While a patch is still in an early discussion stage, consider their earlier incarnation rejected and

Re: [PATCH] doc: status, remove leftover statement about '#' prefix

2014-03-21 Thread Junio C Hamano
Dirk Wallenstein hals...@t-online.de writes: This hasn't been true since 2556b9962e7c0353d562b7bf70eed11d8f29d0b0 Signed-off-by: Dirk Wallenstein hals...@t-online.de --- Good eyes. Thanks. Documentation/git-status.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: File extension conflict when working with git and latex

2014-03-21 Thread Junio C Hamano
Matthias Beyer m...@beyermatthias.de writes: I know, I can fix this by fixing the clean task in my Makefile. But maybe someone somewhere on this world doesn't know the git internals as good as me (and, of course, my coworker). Is there _any chance at all_ that this gets mentioned somewhere,

Re: [PATCH v2] Rewrite fsck.c:fsck_commit() replace memcmp() with starts_with()

2014-03-21 Thread Junio C Hamano
blacksimit cengoguzhanu...@gmail.com writes: From: Oguzhan Unlu cengoguzhanu...@gmail.com My solution to make lines containing buffer += a_number; clearer to anyone is following; I defined a new int, magic_num, then assigned lengths of used strings to magic_num and then changed assignment

Re: Configuring a third-party git hook

2014-03-21 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Mar 21, 2014 at 10:31:59AM -0700, Junio C Hamano wrote: -- 8 -- From: Chris Angelico ros...@gmail.com Date: Fri, 21 Mar 2014 15:07:08 +1100 Subject: [PATCH] config.txt: third-party tools may and do use their own variables [...] +Other git-related

Re: Configuring a third-party git hook

2014-03-21 Thread Junio C Hamano
Jeff King p...@peff.net writes: [1] Is there a word to mean the pluralness of a noun or verb (similar to tense for a verb). I've seen plural vs singular often mentioned in the context of subject and verb agreement. en.wiktionary.org/wiki/concord talks about agreement in gender, number,

Re: What's cooking in git.git (Mar 2014, #04; Thu, 20)

2014-03-21 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 03/20/2014 10:09 PM, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-03-19) 1 commit - remote-hg: do not fail on invalid bookmarks Will merge to 'next'. Hmm, am I the only one who has 11 failures in test-hg-hg-git.sh, like

Re: [PATCH 03/12] t: drop useless sane_unset GIT_* calls

2014-03-21 Thread Junio C Hamano
Jeff King p...@peff.net writes: Several test scripts manually unset GIT_CONFIG and other GIT_* variables. These are generally taken care of for us by test-lib.sh already. Unsetting these is not only useless, but can be confusing to a reader, who may wonder why some tests in a script unset

Re: [PATCH 04/12] t: stop using GIT_CONFIG to cross repo boundaries

2014-03-21 Thread Junio C Hamano
Jeff King p...@peff.net writes: Some tests want to check or set config in another repository. E.g., t1000 creates repositories and makes sure that their core.bare and core.worktree settings are what we expect. We can do this with: GIT_CONFIG=$repo/.git/config git config ... but it

Re: What's cooking in git.git (Mar 2014, #04; Thu, 20)

2014-03-21 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Torsten Bögershausen tbo...@web.de writes: On 03/20/2014 10:09 PM, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-03-19) 1 commit - remote-hg: do not fail on invalid bookmarks Will merge to 'next'. Hmm, am I the only one who has

Re: [PATCH 03/10] t4018: an infrastructure to test hunk headers

2014-03-21 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: Add an infrastructure that simplifies adding new tests of the hunk header regular expressions. To add new tests, a file with the syntax to test can be dropped in the directory t4018. The README file explains how a test file must contain; s/how/what/, or

Re: [PATCH 00/10] userdiff: cpp pattern simplification and test framework

2014-03-21 Thread Junio C Hamano
Thanks; will replace jk/diff-funcname-cpp-regex with this series. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3] remote-hg: do not fail on invalid bookmarks

2014-03-21 Thread Junio C Hamano
Max Horn m...@quendi.de writes: Hi Torsten, On 21.03.2014, at 21:47, Torsten Bögershausen tbo...@web.de wrote: On 2014-03-21 12.36, Max Horn wrote: All tests passed :-), Excellent. thanks from my side. comments inline, some are debatable Thanks for having a close look and for the

Re: [PATCH 03/10] t4018: an infrastructure to test hunk headers

2014-03-23 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: I see what you mean. Notice, however, that we also test whether the regular expressions can be compiled successfully, and for this it is desirable to have the complete list of userdiff drivers. Until we have at least one test-case for each driver, we

Re: [PATCH] Clarify pre-push hook documentation

2014-03-23 Thread Junio C Hamano
David Cowden dco...@gmail.com writes: The documentation as-is does not mention that the pre-push hook is executed even when there is nothing to push. This can lead a new reader to beilieve there will always be lines fed to the script's standerd input and cause minor confusion as to what is

[PATCH 2/3] update-index: teach --cacheinfo a new syntax mode,sha1,path

2014-03-24 Thread Junio C Hamano
--stdin -w path3) path3 \ path4 must make sure path1 is already in the index and update all of these four paths. So this is probably as far as we can go to fix this issue without risking to break people's existing scripts. Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation

[PATCH 3/3] parse-options: make sure argh string does not have SP or _

2014-03-24 Thread Junio C Hamano
C Hamano gits...@pobox.com --- parse-options.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/parse-options.c b/parse-options.c index a5fa0b8..c81d3a0 100644 --- a/parse-options.c +++ b/parse-options.c @@ -375,6 +375,9 @@ static void parse_options_check(const struct option *opts

Re: [PATCH 04/10] t4209: use helper functions to test --grep

2014-03-24 Thread Junio C Hamano
René Scharfe l@web.de writes: -test_expect_success 'log --grep -i' ' - git log -i --grep=InItial --format=%H actual - test_cmp expect_initial actual -' +test_log expect_initial --grep initial +test_log expect_nomatch --grep InItial This, and the next --author one,

Re: [PATCH 03/10] t4209: factor out helper function test_log_icase()

2014-03-24 Thread Junio C Hamano
René Scharfe l@web.de writes: Reduce code duplication by introducing test_log_icase() that runs the same test with both --regexp-ignore-case and -i. The specification of the four basic test scenarios (matching/nomatching combined with case sensitive/insensitive) becomes easier to read

Re: [PATCH 00/10] pickaxe: honor -i when used with -S and --pickaxe-regex; cleanups

2014-03-24 Thread Junio C Hamano
René Scharfe l@web.de writes: This series allows the options -i/--regexp-ignore-case, --pickaxe-regex, and -S to be used together and work as expected to perform a pickaxe search using case-insensitive regular expression matching. Its first half refactors the test script and extends test

Re: [PATCH 2/2] fetch: handle overlaping refspecs on --prune

2014-03-24 Thread Junio C Hamano
Carlos Martín Nieto c...@elego.de writes: From: Carlos Martín Nieto c...@dwim.me We need to consider that a remote-tracking branch may match more than one rhs of a fetch refspec. In such a case, it is not enough to stop at the first match but look at all of the matches in order to determine

What's cooking in git.git (Mar 2014, #05; Mon, 24)

2014-03-24 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. More topics merged to 'master', some of which have been cooking before the v1.9.0 final release, many of them fallouts from GSoC microprojects.

Re: with reuse-delta patches, fetching with bitmaps segfaults due to possibly incomplete bitmap traverse

2014-03-24 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Mar 21, 2014 at 07:58:55PM -0700, Siddharth Agarwal wrote: At Facebook we've found that fetch speed is a bottleneck for our Git repos, so we've been looking to deploy bitmaps to speed up fetches. We've been trying out git-next with the top two patches

Re: [PATCH 12/19] tree-diff: remove special-case diff-emitting code for empty-tree cases

2014-03-24 Thread Junio C Hamano
. Signed-off-by: Kirill Smelkov k...@mns.spb.ru Signed-off-by: Junio C Hamano gits...@pobox.com --- ( re-posting without change ) tree-diff.c | 21 + 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tree-diff.c b/tree-diff.c index cf96ad7..2fd6d0e 100644

Re: [PATCH 11/19] tree-diff: simplify tree_entry_pathcmp

2014-03-24 Thread Junio C Hamano
it now visually looks cleaner. Signed-off-by: Kirill Smelkov k...@mns.spb.ru Signed-off-by: Junio C Hamano gits...@pobox.com --- ( re-posting without change ) Thanks. Hopefully I'll be merging the series up to this point to 'next' soonish. tree-diff.c | 17 ++--- 1 file

<    4   5   6   7   8   9   10   11   12   13   >