Merge branch 'maint'

* maint:
  git-push: .git/remotes/ file does not require SP after colon
  git-mv: invalidate the removed path properly in cache-tree

1 files changed, 19 insertions, 0 deletions

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index b7fcdb390..23a1eff3b 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -86,4 +86,23 @@ test_expect_success \
     'move into "."' \
     'git-mv path1/path2/ .'
 
+test_expect_success "Michael Cassar's test case" '
+	rm -fr .git papers partA &&
+	git init-db &&
+	mkdir -p papers/unsorted papers/all-papers partA &&
+	echo a > papers/unsorted/Thesis.pdf &&
+	echo b > partA/outline.txt &&
+	echo c > papers/unsorted/_another &&
+	git add papers partA &&
+	T1=`git write-tree` &&
+
+	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
+
+	T=`git write-tree` &&
+	git ls-tree -r $T | grep partA/outline.txt || {
+		git ls-tree -r $T
+		(exit 1)
+	}
+'
+
 test_done