Merge branch 'cb/maint-orphan-merge-noclobber'

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 3c0cf0509d2cfe3afc0316ed50ea85cb0d2d14de..14d17691b1c48e2b3211812a16d6dda7e83ad31a 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -321,7 +321,7 @@ test_expect_success \
        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 test_expect_success \
        'C: validate reuse existing blob' \
-       'test $newf = `git rev-parse --verify branch:file2/newf`
+       'test $newf = `git rev-parse --verify branch:file2/newf` &&
         test $oldf = `git rev-parse --verify branch:file2/oldf`'
 
 cat >expect <<EOF