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 /userdiff.c | |
| parent | Merge branch 'ds/doc-add-interactive-singlekey' (diff) | |
| parent | diff: let external diffs report that changes are uninteresting (diff) | |
| download | git-8ba7dbdefbc274628b6bdc0a4cb573c2fa08b2cf.tar.gz git-8ba7dbdefbc274628b6bdc0a4cb573c2fa08b2cf.zip | |
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 'userdiff.c')
| -rw-r--r-- | userdiff.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/userdiff.c b/userdiff.c index 371032a413..c4ebb9ff73 100644 --- a/userdiff.c +++ b/userdiff.c @@ -333,7 +333,7 @@ PATTERNS("scheme", "|([^][)(}{[ \t])+"), PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$", "\\\\[a-zA-Z@]+|\\\\.|([a-zA-Z0-9]|[^\x01-\x7f])+"), -{ "default", NULL, NULL, -1, { NULL, 0 } }, +{ .name = "default", .binary = -1 }, }; #undef PATTERNS #undef IPATTERN @@ -445,7 +445,11 @@ int userdiff_config(const char *k, const char *v) if (!strcmp(type, "binary")) return parse_tristate(&drv->binary, k, v); if (!strcmp(type, "command")) - return git_config_string((char **) &drv->external, k, v); + return git_config_string((char **) &drv->external.cmd, k, v); + if (!strcmp(type, "trustexitcode")) { + drv->external.trust_exit_code = git_config_bool(k, v); + return 0; + } if (!strcmp(type, "textconv")) return git_config_string((char **) &drv->textconv, k, v); if (!strcmp(type, "cachetextconv")) |