diff options
| author | Josef Weidendorfer <Josef.Weidendorfer@gmx.de> | 2006-03-03 17:23:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-03 11:28:28 -0800 |
| commit | 90924d55c5fc4205b2d41821a3288d478aa661a0 (patch) | |
| tree | 5e4623fdbbfd3d04665f2ace8d8dc1bbf77d4d7a /t | |
| parent | 8e69b31e0da6e5a540a3ca2ca16d59f3411385bc (diff) | |
| download | git-90924d55c5fc4205b2d41821a3288d478aa661a0.tar.gz git-90924d55c5fc4205b2d41821a3288d478aa661a0.tar.xz | |
git-mv: fix moves into a subdir from outside
git-mv needs to be run from the base directory so that
the check if a file is under revision also covers files
outside of a subdirectory. Previously, e.g. in the git repo,
cd Documentation; git-mv ../README .
produced the error
Error: '../README' not under version control
The test is extended for this case; it previously only tested
one direction.
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7001-mv.sh | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 43d74c502..811a4797a 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -11,17 +11,31 @@ test_expect_success \ git-commit -m add -a' test_expect_success \ - 'moving the file' \ + 'moving the file out of subdirectory' \ 'cd path0 && git-mv COPYING ../path1/COPYING' # in path0 currently test_expect_success \ 'commiting the change' \ - 'cd .. && git-commit -m move -a' + 'cd .. && git-commit -m move-out -a' test_expect_success \ 'checking the commit' \ 'git-diff-tree -r -M --name-status HEAD^ HEAD | \ grep -E "^R100.+path0/COPYING.+path1/COPYING"' +test_expect_success \ + 'moving the file back into subdirectory' \ + 'cd path0 && git-mv ../path1/COPYING COPYING' + +# in path0 currently +test_expect_success \ + 'commiting the change' \ + 'cd .. && git-commit -m move-in -a' + +test_expect_success \ + 'checking the commit' \ + 'git-diff-tree -r -M --name-status HEAD^ HEAD | \ + grep -E "^R100.+path1/COPYING.+path0/COPYING"' + test_done |