diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-15 07:34:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-15 07:34:05 +0100 |
| commit | 914186a5c3dd687ad157dbda1518a58b58797391 (patch) | |
| tree | 670daf56dbc9c2b5b54fb0f8946bbf2f6b2a7df4 | |
| parent | Make t3411 executable (diff) | |
| parent | fix handling of multiple untracked files for git mv -k (diff) | |
| download | git-914186a5c3dd687ad157dbda1518a58b58797391.tar.xz git-914186a5c3dd687ad157dbda1518a58b58797391.zip | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
fix handling of multiple untracked files for git mv -k
add test cases for "git mv -k"
| -rw-r--r-- | builtin-mv.c | 1 | ||||
| -rwxr-xr-x | t/t7001-mv.sh | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/builtin-mv.c b/builtin-mv.c index 4f65b5ae9b..bce9959293 100644 --- a/builtin-mv.c +++ b/builtin-mv.c @@ -192,6 +192,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) memmove(destination + i, destination + i + 1, (argc - i) * sizeof(char *)); + i--; } } else die ("%s, source=%s, destination=%s", diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 575ef5beb2..ef2e78f9df 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -39,6 +39,31 @@ test_expect_success \ grep "^R100..*path1/COPYING..*path0/COPYING"' test_expect_success \ + 'checking -k on non-existing file' \ + 'git mv -k idontexist path0' + +test_expect_success \ + 'checking -k on untracked file' \ + 'touch untracked1 && + git mv -k untracked1 path0 && + test -f untracked1 && + test ! -f path0/untracked1' + +test_expect_success \ + 'checking -k on multiple untracked files' \ + 'touch untracked2 && + git mv -k untracked1 untracked2 path0 && + test -f untracked1 && + test -f untracked2 && + test ! -f path0/untracked1 + test ! -f path0/untracked2' + +# clean up the mess in case bad things happen +rm -f idontexist untracked1 untracked2 \ + path0/idontexist path0/untracked1 path0/untracked2 \ + .git/index.lock + +test_expect_success \ 'adding another file' \ 'cp "$TEST_DIRECTORY"/../README path0/README && git add path0/README && |