@matheusbsbs / matheus-bagliano / commits / 9a5e4075a4
Fork 0

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>

Eric Wong committed Jan 7, 2007 at 19:35 UTC 9a5e4075a4b54581821584386e5e184a57f06d18
1 file changed +1 -1
git-svn.perl
+1 -1
@@ -1086,7 +1086,7 @@ sub graft_merge_msg {
1086 my ($grafts, $l_map, $u, $p, @re) = @_;
1087
1088 my $x = $l_map->{$u}->{$p};
1089 - my $rl = rev_list_raw($x);
1089 + my $rl = rev_list_raw("refs/remotes/$x");
1090 while (my $c = next_rev_list_entry($rl)) {
1091 foreach my $re (@re) {
1092 my (@br) = ($c->{m} =~ /$re/g);