]> git.ipfire.org Git - thirdparty/git.git/commit - t/t1507-rev-parse-upstream.sh
Merge branch 'jc/diff-exit-code-with-w-fixes' into maint-2.42
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Nov 2023 07:53:15 +0000 (16:53 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Nov 2023 07:53:15 +0000 (16:53 +0900)
commit87644914638e7090334bb123a706fca6840f5763
treed07f143748d06baeb29f2e5c779d25540a7be434
parent1ea39ad4677a7572717a0137aaa46f1cda4e9c4d
parenta64f8b25953b9cf0f6d81ed24e87448ae513b094
Merge branch 'jc/diff-exit-code-with-w-fixes' into maint-2.42

"git diff -w --exit-code" with various options did not work
correctly, which is being addressed.

* jc/diff-exit-code-with-w-fixes:
  diff: the -w option breaks --exit-code for --raw and other output modes
  t4040: remove test that succeeded for a wrong reason
  diff: teach "--stat -w --exit-code" to notice differences
  diff: mode-only change should be noticed by "--patch -w --exit-code"
  diff: move the fallback "--exit-code" code down
diff.c
t/t4015-diff-whitespace.sh