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

* 'master' of git://repo.or.cz/git/fastimport:
  Allow fast-import frontends to reload the marks table
  Use atomic updates to the fast-import mark file
  Preallocate memory earlier in fast-import

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
 ###