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

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

1 files changed, 52 insertions, 0 deletions

diff --git a/third_party/git/t/t2007-checkout-symlink.sh b/third_party/git/t/t2007-checkout-symlink.sh
new file mode 100755
index 000000000000..fc9aad530e9f
--- /dev/null
+++ b/third_party/git/t/t2007-checkout-symlink.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# Copyright (c) 2007 Junio C Hamano
+
+test_description='git checkout to switch between branches with symlink<->dir'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+
+	mkdir frotz &&
+	echo hello >frotz/filfre &&
+	git add frotz/filfre &&
+	test_tick &&
+	git commit -m "master has file frotz/filfre" &&
+
+	git branch side &&
+
+	echo goodbye >nitfol &&
+	git add nitfol &&
+	test_tick &&
+	git commit -m "master adds file nitfol" &&
+
+	git checkout side &&
+
+	git rm --cached frotz/filfre &&
+	mv frotz xyzzy &&
+	test_ln_s_add xyzzy frotz &&
+	git add xyzzy/filfre &&
+	test_tick &&
+	git commit -m "side moves frotz/ to xyzzy/ and adds frotz->xyzzy/"
+
+'
+
+test_expect_success 'switch from symlink to dir' '
+
+	git checkout master
+
+'
+
+test_expect_success 'Remove temporary directories & switch to master' '
+	rm -fr frotz xyzzy nitfol &&
+	git checkout -f master
+'
+
+test_expect_success 'switch from dir to symlink' '
+
+	git checkout side
+
+'
+
+test_done