diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:16 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:16 +0300 |
| commit | 57b52cec46e1b342071df3addd3369a3b60a5916 (patch) | |
| tree | 70b9b432dfc1650096c7d8781ab922128db2b403 /t | |
| parent | a00b1127ce09bb963590faaef342618f719e7cc4 (diff) | |
| parent | 5cc6b2d70bc55ab75913ee93d9ac96ad875fbb29 (diff) | |
Merge branch 'jk/diff-result-code-cleanup' into maint-2.42
"git diff --no-such-option" and other corner cases around the exit
status of the "diff" command has been corrected.
* jk/diff-result-code-cleanup:
diff: drop useless "status" parameter from diff_result_code()
diff: drop useless return values in git-diff helpers
diff: drop useless return from run_diff_{files,index} functions
diff: die when failing to read index in git-diff builtin
diff: show usage for unknown builtin_diff_files() options
diff-files: avoid negative exit value
diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4017-diff-retval.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh index 5bc28ad9f0..f439f469bd 100755 --- a/t/t4017-diff-retval.sh +++ b/t/t4017-diff-retval.sh @@ -138,4 +138,9 @@ test_expect_success 'check honors conflict marker length' ' git reset --hard ' +test_expect_success 'option errors are not confused by --exit-code' ' + test_must_fail git diff --exit-code --nonsense 2>err && + grep '^usage:' err +' + test_done |