Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 970d683650f5ee6b99a07ff10063710292b28ed1..2e1a09ff2db29421629b038a3374449c49bdc79d 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -111,6 +111,14 @@ test_expect_success \
        'A: verify marks output' \
        'diff -u expect marks.out'
 
+test_expect_success \
+       'A: verify marks import' \
+       'git-fast-import \
+               --import-marks=marks.out \
+               --export-marks=marks.new \
+               </dev/null &&
+       diff -u expect marks.new'
+
 ###
 ### series B
 ###