mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'tk/fast-export-anonymized-tag-fix'
The output from "git fast-export", when its anonymization feature is in use, showed an annotated tag incorrectly. * tk/fast-export-anonymized-tag-fix: fast-export: fix anonymized tag using original length
This commit is contained in:
commit
febba8038d
|
@ -821,6 +821,7 @@ static void handle_tag(const char *name, struct tag *tag)
|
|||
static struct hashmap tags;
|
||||
message = anonymize_str(&tags, anonymize_tag,
|
||||
message, message_size, NULL);
|
||||
message_size = strlen(message);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,8 @@ test_expect_success 'setup simple repo' '
|
|||
git update-index --add --cacheinfo 160000,$fake_commit,link1 &&
|
||||
git update-index --add --cacheinfo 160000,$fake_commit,link2 &&
|
||||
git commit -m "add gitlink" &&
|
||||
git tag -m "annotated tag" mytag
|
||||
git tag -m "annotated tag" mytag &&
|
||||
git tag -m "annotated tag with long message" longtag
|
||||
'
|
||||
|
||||
test_expect_success 'export anonymized stream' '
|
||||
|
@ -55,7 +56,8 @@ test_expect_success 'stream retains other as refname' '
|
|||
|
||||
test_expect_success 'stream omits other refnames' '
|
||||
! grep main stream &&
|
||||
! grep mytag stream
|
||||
! grep mytag stream &&
|
||||
! grep longtag stream
|
||||
'
|
||||
|
||||
test_expect_success 'stream omits identities' '
|
||||
|
@ -118,9 +120,9 @@ test_expect_success 'identical gitlinks got identical oid' '
|
|||
test_line_count = 1 commits
|
||||
'
|
||||
|
||||
test_expect_success 'tag points to branch tip' '
|
||||
test_expect_success 'all tags point to branch tip' '
|
||||
git rev-parse $other_branch >expect &&
|
||||
git for-each-ref --format="%(*objectname)" | grep . >actual &&
|
||||
git for-each-ref --format="%(*objectname)" | grep . | uniq >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue