Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: pass an unambiguous ref to rev-list when grafting-branches
author
Eric Wong
<normalperson@yhbt.net>
Mon, 8 Jan 2007 03:35:41 +0000
(19:35 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 8 Jan 2007 05:32:49 +0000
(21:32 -0800)
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>
git-svn.perl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
ae41098
)
diff --git
a/git-svn.perl
b/git-svn.perl
index a092be836e506bb6fff62a929f9bc34280ca6a05..56f17002d1647d5a0e0c59a78a60bd96496dcf1b 100755
(executable)
--- 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);