From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 8 Jan 2007 03:35:41 +0000 (-0800)
Subject: git-svn: pass an unambiguous ref to rev-list when grafting-branches
X-Git-Tag: v1.5.0-rc1~56
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9a5e4075a4b54581821584386e5e184a57f06d18;p=git.git

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>
---

diff --git a/git-svn.perl b/git-svn.perl
index a092be836..56f17002d 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);