Merge branch 'mz/pull-rebase-rebased'

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index dd90a0933e3e7b6f74795f12bbf7e7dc96214b00..e8034d410fe50a770c3122c98967d80937bb1943 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