diff options
| author | Elijah Newren <newren@gmail.com> | 2009-06-25 22:48:28 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-27 14:10:09 -0700 |
| commit | 02c48cd69b3ebfac3867f0f9ceb1503a5af118fc (patch) | |
| tree | 66994995f7af4de50adbca725914df6360a78c91 /t | |
| parent | 668f3aa776bcd293de08413bf1b25b91c15f1b01 (diff) | |
| download | git-02c48cd69b3ebfac3867f0f9ceb1503a5af118fc.tar.gz | |
fast-export: Omit tags that tag trees
Commit c0582c53bcf4e83bba70e1ad23abbad31f96ebc8 introduced logic to just
omit tags that point to tree objects. However, these objects were still
being output and were pointing at "mark :0", which caused fast-import to
crash. This patch makes sure such tags (including deeper nestings such
as tags of tags of trees), are omitted.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9301-fast-export.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index 8c8a9e63c2..3f13e6b15c 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -271,8 +271,14 @@ test_expect_success 'set-up a few more tags for tag export tests' ' git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj ' +test_expect_success 'tree_tag' ' + mkdir result && + (cd result && git init) && + git fast-export tree_tag > fe-stream && + (cd result && git fast-import < ../fe-stream) +' + # NEEDSWORK: not just check return status, but validate the output -test_expect_success 'tree_tag' 'git fast-export tree_tag' test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag' test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' |