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

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

1 files changed, 40 insertions, 0 deletions

diff --git a/third_party/git/t/t4100-apply-stat.sh b/third_party/git/t/t4100-apply-stat.sh
new file mode 100755
index 000000000000..744b8e51beab
--- /dev/null
+++ b/third_party/git/t/t4100-apply-stat.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+test_description='git apply --stat --summary test, with --recount
+
+'
+. ./test-lib.sh
+
+UNC='s/^\(@@ -[1-9][0-9]*\),[0-9]* \(+[1-9][0-9]*\),[0-9]* @@/\1,999 \2,999 @@/'
+
+num=0
+while read title
+do
+	num=$(( $num + 1 ))
+	test_expect_success "$title" '
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	'
+
+	test_expect_success "$title with recount" '
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	'
+done <<\EOF
+rename
+copy
+rewrite
+mode
+non git (1)
+non git (2)
+non git (3)
+incomplete (1)
+incomplete (2)
+EOF
+
+test_done