From: Junio C Hamano Date: Thu, 2 Nov 2023 07:53:16 +0000 (+0900) Subject: Merge branch 'jk/diff-result-code-cleanup' into maint-2.42 X-Git-Tag: v2.42.1~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b52cec46e1b342071df3addd3369a3b60a5916;p=thirdparty%2Fgit.git 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() --- 57b52cec46e1b342071df3addd3369a3b60a5916