Re: [PATCH v4 1/2] diff: move no-index detection to builtin/diff.c

2013-12-16 Thread Junio C Hamano
Thomas Gummerer writes: >> What happens if I run 'git diff --no-index /tmp git.c git.c' from >> within a git repository? With this, I fear I will get > > Thanks, I've missed that one. It only happens when run outside a git > repository, but the same comments still apply. Will fix and send a >

Re: [PATCH v4 1/2] diff: move no-index detection to builtin/diff.c

2013-12-14 Thread Thomas Gummerer
Jonathan Nieder writes: > Hi, > > Thomas Gummerer wrote: > >> Signed-off-by: Thomas Gummerer > > Thanks, and sorry for the slow follow-up. > > [...] >> --- a/builtin/diff.c >> +++ b/builtin/diff.c >> @@ -16,6 +16,9 @@ > [...] >> @@ -283,14 +286,57 @@ int cmd_diff(int argc, const char **argv, con

Re: [PATCH v4 1/2] diff: move no-index detection to builtin/diff.c

2013-12-13 Thread Jonathan Nieder
Hi, Thomas Gummerer wrote: > Signed-off-by: Thomas Gummerer Thanks, and sorry for the slow follow-up. [...] > --- a/builtin/diff.c > +++ b/builtin/diff.c > @@ -16,6 +16,9 @@ [...] > @@ -283,14 +286,57 @@ int cmd_diff(int argc, const char **argv, const char > *prefix) >* Other cases ar

[PATCH v4 1/2] diff: move no-index detection to builtin/diff.c

2013-12-11 Thread Thomas Gummerer
Currently the --no-index option is parsed in diff_no_index(). Move the detection if a no-index diff should be executed to builtin/diff.c, where we can use it for executing diff_no_index() conditionally. This will also allow us to execute other operations conditionally, which will be done in the n