diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-07-26 19:41:05 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-07-26 12:24:49 -0700 |
| commit | a1dad607fa5227c844c0f8ab180b811d23792c02 (patch) | |
| tree | bc30925050cf63d8a245e3c32f74f30956fecdd4 /t | |
| parent | gitweb: fix two warnings (diff) | |
| download | tgif-a1dad607fa5227c844c0f8ab180b811d23792c02.tar.xz | |
t7001: add test for git-mv dir1 dir2/
If dir2 already exists, git-mv should move dir1 _into_dir2/.
Noticed by Jon Smirl.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7001-mv.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index d78c56a2eb..322eaadc73 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -59,4 +59,19 @@ test_expect_success \ git-diff-tree -r -M --name-status HEAD^ HEAD | \ grep -E "^R100.+path0/README.+path2/README"' +test_expect_success \ + 'moving whole subdirectory into subdirectory' \ + 'git-mv path2 path1' + +test_expect_success \ + 'commiting the change' \ + 'git-commit -m dir-move -a' + +test_expect_success \ + 'checking the commit' \ + 'git-diff-tree -r -M --name-status HEAD^ HEAD | \ + grep -E "^R100.+path2/COPYING.+path1/path2/COPYING" && + git-diff-tree -r -M --name-status HEAD^ HEAD | \ + grep -E "^R100.+path2/README.+path1/path2/README"' + test_done |