]> git.ipfire.org Git - thirdparty/git.git/commit
git-svn: fix fetch with deleted tag
authorDavid D. Kilzer <ddkilzer@kilzer.net>
Sun, 15 Aug 2010 13:15:55 +0000 (06:15 -0700)
committerEric Wong <normalperson@yhbt.net>
Sun, 15 Aug 2010 23:43:37 +0000 (23:43 +0000)
commit3235b7053c45a734c1cdf9b117bda68b7ced29c9
treea6567f9bcd2cd3dbc35aea5f011ad7bed2a3049e
parent54fb7f9b08270873b0646d84164e1cebe2deb857
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>
git-svn.perl
t/t9155-git-svn-fetch-deleted-tag.sh [new file with mode: 0755]
t/t9156-git-svn-fetch-deleted-tag-2.sh [new file with mode: 0755]