summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-08 03:35:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-08 05:32:49 (GMT)
commit9a5e4075a4b54581821584386e5e184a57f06d18 (patch)
treeac71708793af47d4109fcc172eb971d19bcce8df /git-svn.perl
parentae41098714898acd52dba291e476a2fedbd2eae2 (diff)
downloadgit-9a5e4075a4b54581821584386e5e184a57f06d18.zip
git-9a5e4075a4b54581821584386e5e184a57f06d18.tar.gz
git-9a5e4075a4b54581821584386e5e184a57f06d18.tar.bz2
git-svn: pass an unambiguous ref to rev-list when grafting-branches
Some users apparently create local heads with the same basename as the remote branch they're tracking. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index a092be8..56f1700 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1086,7 +1086,7 @@ sub graft_merge_msg {
my ($grafts, $l_map, $u, $p, @re) = @_;
my $x = $l_map->{$u}->{$p};
- my $rl = rev_list_raw($x);
+ my $rl = rev_list_raw("refs/remotes/$x");
while (my $c = next_rev_list_entry($rl)) {
foreach my $re (@re) {
my (@br) = ($c->{m} =~ /$re/g);