diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-30 13:24:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-30 13:24:48 -0700 |
| commit | 522a98caa5b9b6b99e08c6c72665d59342d6d5e2 (patch) | |
| tree | 95f69fff268f7c911fc813a6602e0dca8c50f1e7 /t | |
| parent | 2dcb927f37976ef5185cef5452516b170b14cd6c (diff) | |
| parent | ac64a722072bb348476a8a029de9a82073e07fba (diff) | |
| download | git-522a98caa5b9b6b99e08c6c72665d59342d6d5e2.tar.gz git-522a98caa5b9b6b99e08c6c72665d59342d6d5e2.tar.xz | |
Merge branch 'js/mv'
* js/mv:
builtin git-mv: support moving directories
Make git-mv a builtin
Extract helper bits from c-merge-recursive work
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7001-mv.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 322eaadc7..900ca93cd 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -74,4 +74,8 @@ test_expect_success \ git-diff-tree -r -M --name-status HEAD^ HEAD | \ grep -E "^R100.+path2/README.+path1/path2/README"' +test_expect_failure \ + 'do not move directory over existing directory' \ + 'mkdir path0 && mkdir path0/path2 && git-mv path2 path0' + test_done |