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

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

20 files changed, 148 insertions, 0 deletions

diff --git a/third_party/git/t/t4135/.gitignore b/third_party/git/t/t4135/.gitignore
new file mode 100644
index 000000000000..3e58e65f57e5
--- /dev/null
+++ b/third_party/git/t/t4135/.gitignore
@@ -0,0 +1,3 @@
+/file-creation/
+/trad-creation/
+/trad-modification/
diff --git a/third_party/git/t/t4135/add-plain.diff b/third_party/git/t/t4135/add-plain.diff
new file mode 100644
index 000000000000..cf5970a089fa
--- /dev/null
+++ b/third_party/git/t/t4135/add-plain.diff
@@ -0,0 +1,5 @@
+diff -pruN a/postimage.txt b/postimage.txt
+--- a/postimage.txt	1969-12-31 18:00:00.000000000 -0600
++++ b/postimage.txt	2010-08-18 20:13:31.484002255 -0500
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/add-with backslash.diff b/third_party/git/t/t4135/add-with backslash.diff
new file mode 100644
index 000000000000..c6861e19665b
--- /dev/null
+++ b/third_party/git/t/t4135/add-with backslash.diff
@@ -0,0 +1,5 @@
+diff -pruN a/post\image.txt b/post\image.txt
+--- a/post\image.txt	1969-12-31 18:00:00.000000000 -0600
++++ b/post\image.txt	2010-08-18 20:13:31.692002255 -0500
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/add-with quote.diff b/third_party/git/t/t4135/add-with quote.diff
new file mode 100644
index 000000000000..866de78ca170
--- /dev/null
+++ b/third_party/git/t/t4135/add-with quote.diff
@@ -0,0 +1,5 @@
+diff -pruN a/"postimage".txt b/"postimage".txt
+--- a/"postimage".txt	1969-12-31 18:00:00.000000000 -0600
++++ b/"postimage".txt	2010-08-18 20:13:31.756002255 -0500
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/add-with spaces.diff b/third_party/git/t/t4135/add-with spaces.diff
new file mode 100644
index 000000000000..a9a1212a218a
--- /dev/null
+++ b/third_party/git/t/t4135/add-with spaces.diff
@@ -0,0 +1,5 @@
+diff -pruN a/post image.txt b/post image.txt
+--- a/post image.txt	1969-12-31 18:00:00.000000000 -0600
++++ b/post image.txt	2010-08-18 20:13:31.556002255 -0500
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/add-with tab.diff b/third_party/git/t/t4135/add-with tab.diff
new file mode 100644
index 000000000000..bb67cb79309b
--- /dev/null
+++ b/third_party/git/t/t4135/add-with tab.diff
@@ -0,0 +1,5 @@
+diff -pruN a/post	image.txt b/post	image.txt
+--- a/post	image.txt	1969-12-31 18:00:00.000000000 -0600
++++ b/post	image.txt	2010-08-18 20:13:31.628002255 -0500
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/damaged-tz.diff b/third_party/git/t/t4135/damaged-tz.diff
new file mode 100644
index 000000000000..07aaf0837093
--- /dev/null
+++ b/third_party/git/t/t4135/damaged-tz.diff
@@ -0,0 +1,5 @@
+diff -urN -X /usr/people/jes/exclude-linux linux-2.6.12-rc2-mm3-vanilla/post image.txt linux-2.6.12-rc2-mm3/post image.txt
+--- linux-2.6.12-rc2-mm3-vanilla/post image.txt 1969-12-31 16:00:00 -08:00
++++ linux-2.6.12-rc2-mm3/post image.txt 2005-04-12 02:14:06 -07:00
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/damaged.diff b/third_party/git/t/t4135/damaged.diff
new file mode 100644
index 000000000000..68f7ededf91e
--- /dev/null
+++ b/third_party/git/t/t4135/damaged.diff
@@ -0,0 +1,5 @@
+diff -pruN a/postimage.txt b/postimage.txt
+--- a/postimage.txt     1969-12-31 18:00:00.000000000 -0600
++++ b/postimage.txt     2010-08-18 20:13:31.484002255 -0500
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/diff-plain.diff b/third_party/git/t/t4135/diff-plain.diff
new file mode 100644
index 000000000000..acedcfa612e3
--- /dev/null
+++ b/third_party/git/t/t4135/diff-plain.diff
@@ -0,0 +1,5 @@
+--- postimage.txt.orig	2010-08-18 20:13:31.432002255 -0500
++++ postimage.txt	2010-08-18 20:13:31.432002255 -0500
+@@ -1 +1 @@
+-preimage
++postimage
diff --git a/third_party/git/t/t4135/diff-with backslash.diff b/third_party/git/t/t4135/diff-with backslash.diff
new file mode 100644
index 000000000000..9068a61bd982
--- /dev/null
+++ b/third_party/git/t/t4135/diff-with backslash.diff
@@ -0,0 +1,5 @@
+--- post\image.txt.orig	2010-08-18 20:13:31.680002255 -0500
++++ post\image.txt	2010-08-18 20:13:31.680002255 -0500
+@@ -1 +1 @@
+-preimage
++postimage
diff --git a/third_party/git/t/t4135/diff-with quote.diff b/third_party/git/t/t4135/diff-with quote.diff
new file mode 100644
index 000000000000..c8e8cc1a8d64
--- /dev/null
+++ b/third_party/git/t/t4135/diff-with quote.diff
@@ -0,0 +1,5 @@
+--- "postimage".txt.orig	2010-08-18 20:13:31.744002255 -0500
++++ "postimage".txt	2010-08-18 20:13:31.744002255 -0500
+@@ -1 +1 @@
+-preimage
++postimage
diff --git a/third_party/git/t/t4135/diff-with spaces.diff b/third_party/git/t/t4135/diff-with spaces.diff
new file mode 100644
index 000000000000..3512056f2194
--- /dev/null
+++ b/third_party/git/t/t4135/diff-with spaces.diff
@@ -0,0 +1,5 @@
+--- post image.txt.orig	2010-08-18 20:13:31.544002255 -0500
++++ post image.txt	2010-08-18 20:13:31.544002255 -0500
+@@ -1 +1 @@
+-preimage
++postimage
diff --git a/third_party/git/t/t4135/diff-with tab.diff b/third_party/git/t/t4135/diff-with tab.diff
new file mode 100644
index 000000000000..4e6d9b294154
--- /dev/null
+++ b/third_party/git/t/t4135/diff-with tab.diff
@@ -0,0 +1,5 @@
+--- post	image.txt.orig	2010-08-18 20:13:31.616002255 -0500
++++ post	image.txt	2010-08-18 20:13:31.616002255 -0500
+@@ -1 +1 @@
+-preimage
++postimage
diff --git a/third_party/git/t/t4135/funny-tz.diff b/third_party/git/t/t4135/funny-tz.diff
new file mode 100644
index 000000000000..998e3a867e46
--- /dev/null
+++ b/third_party/git/t/t4135/funny-tz.diff
@@ -0,0 +1,5 @@
+diff -urN -X /usr/people/jes/exclude-linux linux-2.6.12-rc2-mm3-vanilla/post image.txt linux-2.6.12-rc2-mm3/post image.txt
+--- linux-2.6.12-rc2-mm3-vanilla/post image.txt	1969-12-31 16:00:00 -08:00
++++ linux-2.6.12-rc2-mm3/post image.txt	2005-04-12 02:14:06 -07:00
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/git-plain.diff b/third_party/git/t/t4135/git-plain.diff
new file mode 100644
index 000000000000..db47d1a693c5
--- /dev/null
+++ b/third_party/git/t/t4135/git-plain.diff
@@ -0,0 +1,7 @@
+diff --git a/postimage.txt b/postimage.txt
+new file mode 100644
+index 0000000..eff0c54
+--- /dev/null
++++ b/postimage.txt
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/git-with backslash.diff b/third_party/git/t/t4135/git-with backslash.diff
new file mode 100644
index 000000000000..0e84a10e936d
--- /dev/null
+++ b/third_party/git/t/t4135/git-with backslash.diff
@@ -0,0 +1,7 @@
+diff --git "a/post\\image.txt" "b/post\\image.txt"
+new file mode 100644
+index 0000000..eff0c54
+--- /dev/null
++++ "b/post\\image.txt"
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/git-with quote.diff b/third_party/git/t/t4135/git-with quote.diff
new file mode 100644
index 000000000000..bdbea8af35d3
--- /dev/null
+++ b/third_party/git/t/t4135/git-with quote.diff
@@ -0,0 +1,7 @@
+diff --git "a/\"postimage\".txt" "b/\"postimage\".txt"
+new file mode 100644
+index 0000000..eff0c54
+--- /dev/null
++++ "b/\"postimage\".txt"
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/git-with spaces.diff b/third_party/git/t/t4135/git-with spaces.diff
new file mode 100644
index 000000000000..baaa810de03e
--- /dev/null
+++ b/third_party/git/t/t4135/git-with spaces.diff
@@ -0,0 +1,7 @@
+diff --git a/post image.txt b/post image.txt
+new file mode 100644
+index 0000000..eff0c54
+--- /dev/null
++++ b/post image.txt	
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/git-with tab.diff b/third_party/git/t/t4135/git-with tab.diff
new file mode 100644
index 000000000000..cca3c9287b21
--- /dev/null
+++ b/third_party/git/t/t4135/git-with tab.diff
@@ -0,0 +1,7 @@
+diff --git "a/post\timage.txt" "b/post\timage.txt"
+new file mode 100644
+index 0000000..eff0c54
+--- /dev/null
++++ "b/post\timage.txt"
+@@ -0,0 +1 @@
++postimage
diff --git a/third_party/git/t/t4135/make-patches b/third_party/git/t/t4135/make-patches
new file mode 100755
index 000000000000..f5f45ddd099e
--- /dev/null
+++ b/third_party/git/t/t4135/make-patches
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+do_filename() {
+	desc=$1
+	postimage=$2
+
+	rm -fr file-creation &&
+	git init file-creation &&
+	(
+		cd file-creation &&
+		git commit --allow-empty -m init &&
+		echo postimage >"$postimage" &&
+		git add -N "$postimage" &&
+		git diff HEAD >"../git-$desc.diff"
+	) &&
+
+	rm -fr trad-modification &&
+	mkdir trad-modification &&
+	(
+		cd trad-modification &&
+		echo preimage >"$postimage.orig" &&
+		echo postimage >"$postimage" &&
+		! diff -u "$postimage.orig" "$postimage" >"../diff-$desc.diff"
+	) &&
+
+	rm -fr trad-creation &&
+	mkdir trad-creation &&
+	(
+		cd trad-creation &&
+		mkdir a b &&
+		echo postimage >"b/$postimage" &&
+		! diff -pruN a b >"../add-$desc.diff"
+	)
+}
+
+do_filename plain postimage.txt &&
+do_filename 'with spaces' 'post image.txt' &&
+do_filename 'with tab' 'post	image.txt' &&
+do_filename 'with backslash' 'post\image.txt' &&
+do_filename 'with quote' '"postimage".txt' &&
+expand add-plain.diff >damaged.diff ||
+{
+	echo >&2 Failed. &&
+	exit 1
+}