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

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

6 files changed, 27 insertions, 0 deletions

diff --git a/third_party/git/t/t7500/add-comments b/third_party/git/t/t7500/add-comments
new file mode 100755
index 000000000000..a72e65c8910f
--- /dev/null
+++ b/third_party/git/t/t7500/add-comments
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "# this is a new comment" >> "$1"
+echo "# and so is this" >> "$1"
+exit 0
diff --git a/third_party/git/t/t7500/add-content b/third_party/git/t/t7500/add-content
new file mode 100755
index 000000000000..2fa3d86a108d
--- /dev/null
+++ b/third_party/git/t/t7500/add-content
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "commit message" >> "$1"
+exit 0
diff --git a/third_party/git/t/t7500/add-content-and-comment b/third_party/git/t/t7500/add-content-and-comment
new file mode 100755
index 000000000000..c4dccff13acf
--- /dev/null
+++ b/third_party/git/t/t7500/add-content-and-comment
@@ -0,0 +1,5 @@
+#!/bin/sh
+echo "commit message" >> "$1"
+echo "# comment" >> "$1"
+exit 0
+
diff --git a/third_party/git/t/t7500/add-signed-off b/third_party/git/t/t7500/add-signed-off
new file mode 100755
index 000000000000..e1d856af6d8b
--- /dev/null
+++ b/third_party/git/t/t7500/add-signed-off
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "Signed-off-by: foo <bar@frotz>" >> "$1"
+exit 0
diff --git a/third_party/git/t/t7500/add-whitespaced-content b/third_party/git/t/t7500/add-whitespaced-content
new file mode 100755
index 000000000000..ccf07c61a4e9
--- /dev/null
+++ b/third_party/git/t/t7500/add-whitespaced-content
@@ -0,0 +1,8 @@
+#!/bin/sh
+sed -e 's/|$//' >>"$1" <<\EOF
+
+ |
+commit message  	 |
+
+EOF
+exit 0
diff --git a/third_party/git/t/t7500/edit-content b/third_party/git/t/t7500/edit-content
new file mode 100755
index 000000000000..08db9fdd2e68
--- /dev/null
+++ b/third_party/git/t/t7500/edit-content
@@ -0,0 +1,4 @@
+#!/bin/sh
+sed -e "s/intermediate/edited/g" <"$1" >"$1-"
+mv "$1-" "$1"
+exit 0