summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-03-07 23:10:05 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-07 23:10:05 -0800
commitf45fa2a073da591f3ac0b63900e07afa2dccee44 (patch)
tree9d1a9d84921d63c61fabbaa4e5e6d1e4aef50d70 /t
parentTeach receive-pack to run pre-receive/post-receive hooks (diff)
parentAllow fast-import frontends to reload the marks table (diff)
downloadtgif-f45fa2a073da591f3ac0b63900e07afa2dccee44.tar.xz
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
Diffstat (limited to 't')
-rwxr-xr-xt/t9300-fast-import.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 970d683650..2e1a09ff2d 100755
--- 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
###