diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:08 -0700 |
| commit | 8ba7dbdefbc274628b6bdc0a4cb573c2fa08b2cf (patch) | |
| tree | 6efe99411643f419d78bcdee1a62c84eb2bb070a /Documentation/git.txt | |
| parent | e631115ae50dbadd891bc1ff4fdd9722f8bf8a28 (diff) | |
| parent | d7b97b7185521e3b9364b3abc6553df2480da173 (diff) | |
| download | git-8ba7dbdefbc274628b6bdc0a4cb573c2fa08b2cf.tar.xz | |
Merge branch 'rs/diff-exit-code-with-external-diff'
"git diff --exit-code --ext-diff" learned to take the exit status
of the external diff driver into account when deciding the exit
status of the overall "git diff" invocation when configured to do
so.
* rs/diff-exit-code-with-external-diff:
diff: let external diffs report that changes are uninteresting
userdiff: add and use struct external_diff
t4020: test exit code with external diffs
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index a31a70acca..4489e2297a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -644,6 +644,16 @@ parameter, <path>. For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set. +`GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE`:: + If this Boolean environment variable is set to true then the + `GIT_EXTERNAL_DIFF` command is expected to return exit code + 0 if it considers the input files to be equal or 1 if it + considers them to be different, like `diff(1)`. + If it is set to false, which is the default, then the command + is expected to return exit code 0 regardless of equality. + Any other exit code causes Git to report a fatal error. + + `GIT_DIFF_PATH_COUNTER`:: A 1-based counter incremented by one for every path. |