diff options
author | David D. Kilzer <ddkilzer@kilzer.net> | 2010-08-15 06:15:55 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2010-08-15 23:43:37 +0000 |
commit | 3235b7053c45a734c1cdf9b117bda68b7ced29c9 (patch) | |
tree | a6567f9bcd2cd3dbc35aea5f011ad7bed2a3049e /builtin/commit-tree.c | |
parent | 54fb7f9b08270873b0646d84164e1cebe2deb857 (diff) | |
download | git-3235b7053c45a734c1cdf9b117bda68b7ced29c9.tar.gz |
git-svn: fix fetch with deleted tag
Currently git-svn assumes that two tags created from the same
revision will have the same repo url, so it uses a ref to the
tag without checking that its url matches the current url.
This causes issues when fetching an svn repo where a tag was
created, deleted, and then recreated under the following
circumstances:
- Both tags were copied from the same revision.
- Both tags had the same name.
- Both tags had different repository paths.
- [Optional] Both tags have a file with the same name but
different content.
When all four conditions are met, a checksum mismatch error
occurs because the content of two files with the same path
differs (see t/t9155--git-svn-fetch-deleted-tag.sh):
Checksum mismatch: ChangeLog 065854....
expected: ce771b....
got: 9563fd....
When only the first three conditions are met, no error occurs
but the tag in git matches the first (deleted) tag instead of
the last (most recent) tag (see
t/t9156-git-svn-fetch-deleted-tag-2.sh).
The fix is to verify that the repo url for the ref matches the
current url. If the urls do not match, then a "tail" is grown
on the tag name by appending a dash and rechecking the new ref's
repo url until either a matching repo url is found or a new tag
is created.
Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions