merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373

Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'

1 files changed, 20 insertions, 0 deletions

diff --git a/third_party/git/t/t4033-diff-patience.sh b/third_party/git/t/t4033-diff-patience.sh
new file mode 100755
index 000000000000..113304dc5960
--- /dev/null
+++ b/third_party/git/t/t4033-diff-patience.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+test_description='patience diff algorithm'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-alternative.sh
+
+test_expect_success '--ignore-space-at-eol with a single appended character' '
+	printf "a\nb\nc\n" >pre &&
+	printf "a\nbX\nc\n" >post &&
+	test_must_fail git diff --no-index \
+		--patience --ignore-space-at-eol pre post >diff &&
+	grep "^+.*X" diff
+'
+
+test_diff_frobnitz "patience"
+
+test_diff_unique "patience"
+
+test_done