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.

diff --combined t/t7001-mv.sh
index ef2e78f9df951cfacf5914dfff2a218d2e6f89f7,d2ec550af6c749ed6f41c89ca9f4c238e227034d..8fb3a56838dd476b9b0923f835ce70bd95499f2b
--- 1/t/t7001-mv.sh
--- 2/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'