[PATCH 2/2] git-svn: pass an unambiguous ref to rev-list when grafting-branches

From: Eric Wong <normalperson@yhbt.net>
Date: Jan 8, 2007, 03:35 UTC
Message-ID: <11682273424039-git-send-email-normalperson@yhbt.net>
In-Reply-To: <11682273413995-git-send-email-normalperson@yhbt.net>

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>
---
 git-svn.perl |    2 +-
 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);

-- 
1.5.0.rc0.ge21b-dirty