delta/git.git/git-difftool--helper.sh, branch ce/https-public-key-pinning

difftool--helper: add explicit exit statement

2014-11-21T19:27:53+00:00

git-difftool--helper returns a zero exit status unless
--trust-exit-code is in effect.  Add an explicit exit statement
to make this clearer.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

difftool: add support for --trust-exit-code

2014-10-28T17:36:57+00:00

Teach difftool to exit when a diff tool returns a non-zero exit
code when either --trust-exit-code is specified or
difftool.trustExitCode is true.

Forward exit codes from invoked diff tools to the caller when
--trust-exit-code is used.

Suggested-by: Adri Farr <14farresa@gmail.com>
Helped-by: Johannes Sixt 
Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

difftool--helper: exit when reading a prompt answer fails

2014-10-27T18:17:56+00:00

An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does
not quit it, but is treated as if 'yes' was answered to the prompt and
all following prompts, which is contrary to the user's intent. Fix the
error check.

Signed-off-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

difftool: display the number of files in the diff queue in the prompt

2013-12-06T22:00:27+00:00

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:

    Viewing: 'diff.c'
    Launch 'vimdiff' [Y/n]:

Consider the modified prompt:

    Viewing (1/5): 'diff.c'
    Launch 'vimdiff' [Y/n]:

The current GIT_EXTERNAL_DIFF mechanism does not tell the number of
paths in the diff queue nor the current counter.  To make this
"counter/total" info available for GIT_EXTERNAL_DIFF programs
without breaking existing ones by doing the following:

 - Keep track of the number of paths shown so far in diff_options;

 - Export two new environment variables from run_external_diff() to
   show the total number of paths (from diff_queue_struct) and the
   current value of the counter (from diff_options); and

 - Update git-difftool--helper to use these two environment variables.

Signed-off-by: Zoltan Klinger 
Signed-off-by: Junio C Hamano

difftool--helper: fix printf usage

2013-02-10T19:35:50+00:00

Do not use a random string as if it is a format string for printf
when showing it literally; instead feed it to '%s' format.

Reported-by: Asheesh Laroia 
Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

difftool: teach difftool to handle directory diffs

2012-04-23T18:59:34+00:00

When 'difftool' is called to compare a range of commits that modify
more than one file, it opens a separate instance of the diff tool for
each file that changed.

The new '--dir-diff' option copies all the modified files to a temporary
location and runs a directory diff on them in a single instance of the
diff tool.

Signed-off-by: Tim Henigan 
Signed-off-by: Junio C Hamano

git-difftool: allow skipping file by typing 'n' at prompt

2011-10-10T17:21:11+00:00

This is useful if you forgot to restrict the diff to the paths you want
to see, or selecting precisely the ones you want is too much typing.

[jc: with a change to return from the function upon 'n' by Charles Bailey
and a small tweak in stdin_doesnot_contain() in the test]

Signed-off-by: Sitaram Chamarty 
Signed-off-by: Junio C Hamano

difftool--helper: Make style consistent with git

2011-08-19T07:09:17+00:00

Use the predominant conditional style where "then" appears
alone on the line after the test expression.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

difftool: provide basename to external tools

2010-12-16T21:01:36+00:00

Currently, only configured diff helpers get the basename of the file
being compared. Tools specified with "git difftool -x" only get the
names of temporary files for the different versions.

Export BASE so that an external tool can read the name from the
environment. Rather than using a third argument, this avoids breaking
existing scripts which may somewhat carelessly be using "$@" rather than
"$1" "$2".

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

Make difftool.prompt fall back to mergetool.prompt

2010-01-22T23:57:45+00:00

The documentation states that "git-difftool falls back to git-mergetool
config variables when the difftool equivalents have not been defined".
Until now, this was not the case for "difftool.prompt".

Signed-off-by: Sebastian Schuberth 
Acked-by: David Aguilar 
Signed-off-by: Junio C Hamano