From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Wed, 14 Jan 2009 17:03:22 +0000 (+0100)
Subject: fix handling of multiple untracked files for git mv -k
X-Git-Tag: v1.6.1.1~10^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=be17262d13f5f3df5ee9635b11dad180613e9cbd;p=git.git

fix handling of multiple untracked files for git mv -k

The "-k" option to "git mv" should allow specifying multiple untracked
files. Currently, multiple untracked files raise an assertion if they
appear consecutively as arguments. Fix this by decrementing the loop
index after removing one entry from the array of arguments.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-mv.c b/builtin-mv.c
index 4f65b5ae9..bce995929 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 fddcdde6e..19493c805 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -49,7 +49,7 @@ test_expect_success \
      test -f untracked1 &&
      test ! -f path0/untracked1'
 
-test_expect_failure \
+test_expect_success \
     'checking -k on multiple untracked files' \
     'touch untracked2 &&
      git mv -k untracked1 untracked2 path0 &&