averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/diff-exit-code-with-external-diff'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2024-06-20 15:45:08 -07:00
parent e631115ae5 d7b97b7185
commit 8ba7dbdefb
8 changed files with 168 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
userdiff.h
View File

@@ -11,9 +11,14 @@ struct userdiff_funcname {
int cflags;
};
struct external_diff {
char *cmd;
unsigned trust_exit_code:1;
};
struct userdiff_driver {
const char *name;
const char *external;
struct external_diff external;
const char *algorithm;
int binary;
struct userdiff_funcname funcname;