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

2013-12-04 Thread Junio C Hamano
Eric Sunshine writes: >> + setenv ("GIT_DIFF_PATH_COUNTER", counterstr.buf, 1); >> + setenv ("GIT_DIFF_PATH_TOTAL", totalstr.buf, 1); >> + >> retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL); > > Would run_command_v_opt_cd_env() be more appropriate than setenv() + > run_

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

2013-12-03 Thread Eric Sunshine
On Tue, Dec 3, 2013 at 8:26 PM, Zoltan Klinger wrote: > diff --git a/diff.c b/diff.c > index e34bf97..c4078af 100644 > --- a/diff.c > +++ b/diff.c > @@ -2899,11 +2899,18 @@ static void run_external_diff(const char *pgm, > struct diff_filespec *one, >

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

2013-12-03 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