Skip to content

Commit

Permalink
git-svn: pass an unambiguous ref to rev-list when grafting-branches
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Jan 8, 2007
1 parent ae41098 commit 9a5e407
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9a5e407

Please sign in to comment.