* [PATCH] git-cvsimport: fix merging with remote parent branch
@ 2008-03-12 19:54 Marc-Andre Lureau
0 siblings, 0 replies; only message in thread
From: Marc-Andre Lureau @ 2008-03-12 19:54 UTC (permalink / raw)
To: git; +Cc: Martin Langhoff, Marc-Andre Lureau
commit-tree fails when specifying a remote name (via -r option) and
one of the parent branch has a name. Prefixing with "$remote/" fix it.
Signed-off-by: Marc-Andre Lureau <marcandre.lureau@gmail.com>
---
git-cvsimport.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 47f116f..95c5eec 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -735,7 +735,7 @@ sub commit {
next unless $logmsg =~ $rx && $1;
my $mparent = $1 eq 'HEAD' ? $opt_o : $1;
if (my $sha1 = get_headref("$remote/$mparent")) {
- push @commit_args, '-p', $mparent;
+ push @commit_args, '-p', "$remote/$mparent";
print "Merge parent branch: $mparent\n" if $opt_v;
}
}
--
1.5.4.4.534.gfb90c.dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-12 19:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-12 19:54 [PATCH] git-cvsimport: fix merging with remote parent branch Marc-Andre Lureau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).