Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)

On Fri, Aug 08, 2014 at 03:18:11PM -0700, Junio C Hamano wrote: > * jk/pack-bitmap (2014-08-04) 1 commit > - pack-bitmap: do not use gcc packed attribute > > Will merge to 'next'. You may want to hold off on merging this; I hope Karsten will re-roll his neater replacement patch next week, whic

[PATCH v2 8/8] mv: no SP between function name and the first opening parenthese

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index cbe220f..bf513e0 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -230,7 +230,7 @@ int cmd_mv(int argc, const char **argv, const char *pref

[PATCH v2 7/8] mv: combine two if(s)

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 988945c..cbe220f 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -275,10 +275,9 @@ int cmd_mv(int argc, const char **argv, const char *

[PATCH v2 5/8] mv: move index search code out

"Huh?" is removed from die() message. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 42 +- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 0732355..dcfcb11 100644 --- a/builtin/mv.c +++ b/builtin/m

[PATCH v2 3/8] mv: split submodule move preparation code out

"Huh?" is removed from die() message. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 35 +-- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index c48129e..524f4e5 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@

[PATCH v2 4/8] mv: remove an "if" that's always true

This is inside an "else" block of "if (last - first < 1)", so we know that "last - first >= 1" when we come here. No need to check "last - first > 0". While at there, save "argc + last - first" to a variable to shorten the statements a bit. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c |

[PATCH v2 6/8] mv: unindent one level for directory move code

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 47 +-- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index dcfcb11..988945c 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -171,42 +171,37 @@ int cmd_

[PATCH v2 1/8] mv: mark strings for translations

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/mv.c b/builtin/mv.c index 6ffe540..b892f63 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -108,7 +108,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)

[PATCH v2 0/8] builtin/mv.c cleanup

Interdiff on v1 below. I'm not going with MOVE_UP_BY_ONE because [1] seems to agree with the name CLOSE_GAP, but that should be a separate topic (touching more than just mv.c) [1] http://thread.gmane.org/gmane.comp.version-control.git/243675/focus=244390 -- 8< -- diff --git a/builtin/mv.c b/built

[PATCH v2 2/8] mv: flatten error handling code block

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 34 -- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index b892f63..c48129e 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -225,24 +225,22 @@ int cmd_mv(int argc,

Re: What's cooking in git.git (Aug 2014, #02; Fri, 8)

On Fri, Aug 08, 2014 at 03:18:11PM -0700, Junio C Hamano wrote: > * cb/mergetool-difftool (2014-07-21) 2 commits > - difftool: don't assume that default sh is sane > - mergetool: don't require a work tree for --tool-help > > Update the way the "difftool --help" shows the help message that is >

[PATCH] read-cache: check for leading symlinks when refreshing index

Don't add paths with leading symlinks to the index while refreshing; we only track those symlinks themselves. We already ignore them while preloading (see read_index_preload.c). Reported-by: Nikolay Avdeev Signed-off-by: Rene Scharfe --- read-cache.c | 8 t/t7515-status