From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jan 2009 06:34:05 +0000 (-0800)
Subject: Merge branch 'maint-1.6.0' into maint
X-Git-Tag: v1.6.1.1~20
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=914186a5c3dd687ad157dbda1518a58b58797391;p=git.git

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"
---

914186a5c3dd687ad157dbda1518a58b58797391
diff --cc t/t7001-mv.sh
index 575ef5beb,19493c805..ef2e78f9d
--- a/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'