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"

diff --cc t/t7001-mv.sh
index 575ef5beb2bdd3a0814fb45010ae7889b936f543,19493c8052b8fe009c80336230b2044669c23394..ef2e78f9df951cfacf5914dfff2a218d2e6f89f7
--- 1/t/t7001-mv.sh
--- 2/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@@ -38,9 -38,34 +38,34 @@@ test_expect_success 
      'git diff-tree -r -M --name-status  HEAD^ HEAD | \
      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 ../../README path0/README &&
 +    'cp "$TEST_DIRECTORY"/../README path0/README &&
       git add path0/README &&
       git commit -m add2 -a'