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

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

1 files changed, 50 insertions, 0 deletions

diff --git a/third_party/git/t/lib-patch-mode.sh b/third_party/git/t/lib-patch-mode.sh
new file mode 100644
index 000000000000..cfd76bf987bd
--- /dev/null
+++ b/third_party/git/t/lib-patch-mode.sh
@@ -0,0 +1,50 @@
+: included from t2016 and others
+
+. ./test-lib.sh
+
+# set_state <path> <worktree-content> <index-content>
+#
+# Prepare the content for path in worktree and the index as specified.
+set_state () {
+	echo "$3" > "$1" &&
+	git add "$1" &&
+	echo "$2" > "$1"
+}
+
+# save_state <path>
+#
+# Save index/worktree content of <path> in the files _worktree_<path>
+# and _index_<path>
+save_state () {
+	noslash="$(echo "$1" | tr / _)" &&
+	cat "$1" > _worktree_"$noslash" &&
+	git show :"$1" > _index_"$noslash"
+}
+
+# set_and_save_state <path> <worktree-content> <index-content>
+set_and_save_state () {
+	set_state "$@" &&
+	save_state "$1"
+}
+
+# verify_state <path> <expected-worktree-content> <expected-index-content>
+verify_state () {
+	test "$(cat "$1")" = "$2" &&
+	test "$(git show :"$1")" = "$3"
+}
+
+# verify_saved_state <path>
+#
+# Call verify_state with expected contents from the last save_state
+verify_saved_state () {
+	noslash="$(echo "$1" | tr / _)" &&
+	verify_state "$1" "$(cat _worktree_"$noslash")" "$(cat _index_"$noslash")"
+}
+
+save_head () {
+	git rev-parse HEAD > _head
+}
+
+verify_saved_head () {
+	test "$(cat _head)" = "$(git rev-parse HEAD)"
+}