diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-06-22 14:32:58 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-06-22 14:32:58 -0700 |
commit | dd503ed4d121e24888f3b20c0f353857b164b6a1 (patch) | |
tree | 21e940bfbe9b33af7ace374213a1180422a63148 /t | |
parent | Merge branch 'mo/status-untracked' (diff) | |
parent | builtin-fast-export: Add importing and exporting of revision marks (diff) | |
download | tgif-dd503ed4d121e24888f3b20c0f353857b164b6a1.tar.xz |
Merge branch 'pb/fast-export'
* pb/fast-export:
builtin-fast-export: Add importing and exporting of revision marks
Diffstat (limited to 't')
-rwxr-xr-x | t/t9301-fast-export.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index f09bfb1117..60b5ee3979 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -78,6 +78,30 @@ test_expect_success 'iso-8859-1' ' git cat-file commit i18n | grep "Áéí óú") ' +test_expect_success 'import/export-marks' ' + + git checkout -b marks master && + git fast-export --export-marks=tmp-marks HEAD && + test -s tmp-marks && + cp tmp-marks ~ && + test $(wc -l < tmp-marks) -eq 3 && + test $( + git fast-export --import-marks=tmp-marks\ + --export-marks=tmp-marks HEAD | + grep ^commit | + wc -l) \ + -eq 0 && + echo change > file && + git commit -m "last commit" file && + test $( + git fast-export --import-marks=tmp-marks \ + --export-marks=tmp-marks HEAD | + grep ^commit\ | + wc -l) \ + -eq 1 && + test $(wc -l < tmp-marks) -eq 4 + +' cat > signed-tag-import << EOF tag sign-your-name |