global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  git-svn: fix fetch with deleted tag
  git-svn: fix regex to remove "tail" from svn tags
This commit is contained in:
Junio C Hamano
2010-08-15 20:22:13 -07:00
parent f2a27ee4a3 3235b7053c
commit 7a555bd17e
3 changed files with 100 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
git-svn.perl
View File

@@ -2959,18 +2959,29 @@ sub other_gs {
my $gs = Git::SVN->find_by_url($new_url, $url, $branch_from);
unless ($gs) {
my $ref_id = $old_ref_id;
$ref_id =~ s/\@\d+$//;
$ref_id =~ s/\@\d+-*$//;
$ref_id .= "\@$r";
# just grow a tail if we're not unique enough :x
$ref_id .= '-' while find_ref($ref_id);
print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
my ($u, $p, $repo_id) = ($new_url, '', $ref_id);
if ($u =~ s#^\Q$url\E(/|$)##) {
$p = $u;
$u = $url;
$repo_id = $self->{repo_id};
}
$gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
while (1) {
# It is possible to tag two different subdirectories at
# the same revision. If the url for an existing ref
# does not match, we must either find a ref with a
# matching url or create a new ref by growing a tail.
$gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
my (undef, $max_commit) = $gs->rev_map_max(1);
last if (!$max_commit);
my ($url) = ::cmt_metadata($max_commit);
last if ($url eq $gs->full_url);
$ref_id .= '-';
}
print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
}
$gs
}

42
t/t9155-git-svn-fetch-deleted-tag.sh Executable file
View File

@@ -0,0 +1,42 @@
#!/bin/sh
test_description='git svn fetch deleted tag'
. ./lib-git-svn.sh
test_expect_success 'setup svn repo' '
mkdir -p import/trunk/subdir &&
mkdir -p import/branches &&
mkdir -p import/tags &&
echo "base" >import/trunk/subdir/file &&
svn_cmd import -m "import for git svn" import "$svnrepo" &&
rm -rf import &&
svn_cmd mkdir --parents -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
svn_cmd cp -m "create branch mybranch" "$svnrepo/trunk" "$svnrepo/branches/mybranch/trunk" &&
svn_cmd co "$svnrepo/trunk" svn_project &&
(cd svn_project &&
echo "trunk change" >>subdir/file &&
svn_cmd ci -m "trunk change" subdir/file &&
svn_cmd switch "$svnrepo/branches/mybranch/trunk" &&
echo "branch change" >>subdir/file &&
svn_cmd ci -m "branch change" subdir/file
) &&
svn_cmd cp -m "create mytag attempt 1" -r5 "$svnrepo/trunk/subdir" "$svnrepo/tags/mytag" &&
svn_cmd rm -m "delete mytag attempt 1" "$svnrepo/tags/mytag" &&
svn_cmd cp -m "create mytag attempt 2" -r5 "$svnrepo/branches/mybranch/trunk/subdir" "$svnrepo/tags/mytag"
'
test_expect_success 'fetch deleted tags from same revision with checksum error' '
git svn init --stdlayout "$svnrepo" git_project &&
cd git_project &&
git svn fetch &&
git diff --exit-code mybranch:trunk/subdir/file tags/mytag:file &&
git diff --exit-code master:subdir/file tags/mytag^:file
'
test_done

44
t/t9156-git-svn-fetch-deleted-tag-2.sh Executable file
View File

@@ -0,0 +1,44 @@
#!/bin/sh
test_description='git svn fetch deleted tag 2'
. ./lib-git-svn.sh
test_expect_success 'setup svn repo' '
mkdir -p import/branches &&
mkdir -p import/tags &&
mkdir -p import/trunk/subdir1 &&
mkdir -p import/trunk/subdir2 &&
mkdir -p import/trunk/subdir3 &&
echo "file1" >import/trunk/subdir1/file &&
echo "file2" >import/trunk/subdir2/file &&
echo "file3" >import/trunk/subdir3/file &&
svn_cmd import -m "import for git svn" import "$svnrepo" &&
rm -rf import &&
svn_cmd co "$svnrepo/trunk" svn_project &&
(cd svn_project &&
echo "change1" >>subdir1/file &&
echo "change2" >>subdir2/file &&
echo "change3" >>subdir3/file &&
svn_cmd ci -m "change" .
) &&
svn_cmd cp -m "create mytag 1" -r2 "$svnrepo/trunk/subdir1" "$svnrepo/tags/mytag" &&
svn_cmd rm -m "delete mytag 1" "$svnrepo/tags/mytag" &&
svn_cmd cp -m "create mytag 2" -r2 "$svnrepo/trunk/subdir2" "$svnrepo/tags/mytag" &&
svn_cmd rm -m "delete mytag 2" "$svnrepo/tags/mytag" &&
svn_cmd cp -m "create mytag 3" -r2 "$svnrepo/trunk/subdir3" "$svnrepo/tags/mytag"
'
test_expect_success 'fetch deleted tags from same revision with no checksum error' '
git svn init --stdlayout "$svnrepo" git_project &&
cd git_project &&
git svn fetch &&
git diff --exit-code master:subdir3/file tags/mytag:file &&
git diff --exit-code master:subdir2/file tags/mytag^:file &&
git diff --exit-code master:subdir1/file tags/mytag^^:file
'
test_done