Re: [PATCH v3] difftool: Change prompt to display the number of files in the diff queue

2013-12-17 Thread Junio C Hamano
David Aguilar writes: > Thanks for the patch, and sorry for the late response. > I have just a couple of notes below... > > On Fri, Dec 06, 2013 at 10:38:46AM +1100, Zoltan Klinger wrote: >> diff --git a/diff.c b/diff.c >> index e34bf97..a7d5a47 100644 >> --- a/diff.c >> +++ b/diff.c >> @@ -2899,

Re: [PATCH v3] difftool: Change prompt to display the number of files in the diff queue

2013-12-17 Thread David Aguilar
Thanks for the patch, and sorry for the late response. I have just a couple of notes below... On Fri, Dec 06, 2013 at 10:38:46AM +1100, Zoltan Klinger wrote: > diff --git a/diff.c b/diff.c > index e34bf97..a7d5a47 100644 > --- a/diff.c > +++ b/diff.c > @@ -2899,11 +2899,16 @@ static void run_exter

Re: [PATCH v3] difftool: Change prompt to display the number of files in the diff queue

2013-12-16 Thread Junio C Hamano
Thanks. -- 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] difftool: Change prompt to display the number of files in the diff queue

2013-12-16 Thread Jeff King
On Fri, Dec 06, 2013 at 10:38:46AM +1100, Zoltan Klinger wrote: > @@ -2928,7 +2933,14 @@ static void run_external_diff(const char *pgm, > } > *arg = NULL; > fflush(NULL); > - retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL); > + > + env[0] = env_counter; > + snp

Re: [PATCH v3] difftool: Change prompt to display the number of files in the diff queue

2013-12-06 Thread Junio C Hamano
Zoltan Klinger writes: > Reworked patch to use run_command_v_opt_cd_env() function when invoking > the external diff program. Modified test script to use write_script > helper function. Thanks; will queue with a minor tweak. -- To unsubscribe from this list: send the line "unsubscribe git" in th

[PATCH v3] difftool: Change prompt to display the number of files in the diff queue

2013-12-05 Thread Zoltan Klinger
When --prompt option is set, git-difftool displays a prompt for each modified file to be viewed in an external diff program. At that point it could be useful to display a counter and the total number of files in the diff queue. Below is the current difftool prompt for the first of 5 modified files