From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Feb 2009 19:49:07 +0000 (-0800)
Subject: Merge branch 'maint-1.6.0' into maint
X-Git-Tag: v1.6.1.3~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/745bc77604f56d9253958fbcab81c4a8cd3bf170?ds=inline;hp=-c

Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
builtin-mv.c: check for unversionned files before looking at the destination.
Add a testcase for "git mv -f" on untracked files.
Missing && in t/t7001.sh.
---

745bc77604f56d9253958fbcab81c4a8cd3bf170
diff --combined t/t7001-mv.sh
index ef2e78f9df,d2ec550af6..8fb3a56838
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@@ -6,7 -6,7 +6,7 @@@ test_description='git mv in subdirs
  test_expect_success \
      'prepare reference tree' \
      'mkdir path0 path1 &&
 -     cp ../../COPYING path0/COPYING &&
 +     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
       git add path0/COPYING &&
       git commit -m add -a'
  
@@@ -55,9 -55,17 +55,17 @@@ test_expect_success 
       git mv -k untracked1 untracked2 path0 &&
       test -f untracked1 &&
       test -f untracked2 &&
-      test ! -f path0/untracked1
+      test ! -f path0/untracked1 &&
       test ! -f path0/untracked2'
  
+ test_expect_success \
+     'checking -f on untracked file with existing target' \
+     'touch path0/untracked1 &&
+      git mv -f untracked1 path0
+      test ! -f .git/index.lock &&
+      test -f untracked1 &&
+      test -f path0/untracked1'
+ 
  # clean up the mess in case bad things happen
  rm -f idontexist untracked1 untracked2 \
       path0/idontexist path0/untracked1 path0/untracked2 \
@@@ -65,7 -73,7 +73,7 @@@
  
  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'