Merge branch 'sg/filter-branch-dwim-ambiguity' into maint

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index aac126fd57cc140f90e841e6568152e15d1a90e7..9984c48b5a75a2f6442616602e79f4689e7066fb 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -2339,6 +2339,19 @@ test_expect_success !MINGW 'R: in-stream cat-blob-fd not respected' '
        test_cmp expect actual.1
 '
 
+test_expect_success !MINGW 'R: print mark for new blob' '
+       echo "effluentish" | git hash-object --stdin >expect &&
+       git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
+       blob
+       mark :1
+       data <<BLOB_END
+       effluentish
+       BLOB_END
+       get-mark :1
+       EOF
+       test_cmp expect actual
+'
+
 test_expect_success !MINGW 'R: print new blob' '
        blob=$(echo "yep yep yep" | git hash-object --stdin) &&
        cat >expect <<-EOF &&