Merge part of branch 'jc/upload-pack'

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 900ca93cde02f82c35a59ee99349f9d0c4213867..b7fcdb390c588545f2419ab3c825b924fbf96dd2 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -59,6 +59,10 @@ test_expect_success \
      git-diff-tree -r -M --name-status  HEAD^ HEAD | \
      grep -E "^R100.+path0/README.+path2/README"'
 
+test_expect_success \
+    'succeed when source is a prefix of destination' \
+    'git-mv path2/COPYING path2/COPYING-renamed'
+
 test_expect_success \
     'moving whole subdirectory into subdirectory' \
     'git-mv path2 path1'
@@ -78,4 +82,8 @@ test_expect_failure \
     'do not move directory over existing directory' \
     'mkdir path0 && mkdir path0/path2 && git-mv path2 path0'
 
+test_expect_success \
+    'move into "."' \
+    'git-mv path1/path2/ .'
+
 test_done