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

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

1 files changed, 31 insertions, 0 deletions

diff --git a/third_party/git/t/t9102-git-svn-deep-rmdir.sh b/third_party/git/t/t9102-git-svn-deep-rmdir.sh
new file mode 100755
index 0000000000..66cd51102c
--- /dev/null
+++ b/third_party/git/t/t9102-git-svn-deep-rmdir.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+test_description='git svn rmdir'
+. ./lib-git-svn.sh
+
+test_expect_success 'initialize repo' '
+	mkdir import &&
+	(
+		cd import &&
+		mkdir -p deeply/nested/directory/number/1 &&
+		mkdir -p deeply/nested/directory/number/2 &&
+		echo foo >deeply/nested/directory/number/1/file &&
+		echo foo >deeply/nested/directory/number/2/another &&
+		svn_cmd import -m "import for git svn" . "$svnrepo"
+	)
+	'
+
+test_expect_success 'mirror via git svn' '
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	git checkout -f -b test-rmdir remotes/git-svn
+	'
+
+test_expect_success 'Try a commit on rmdir' '
+	git rm -f deeply/nested/directory/number/2/another &&
+	git commit -a -m "remove another" &&
+	git svn set-tree --rmdir HEAD &&
+	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
+	'
+
+
+test_done