{"thread":{"id":"12654","subject":"[PATCH] git-cvsimport: fix merging with remote parent branch","startedAt":"2008-03-12T19:54:21Z","lastAt":"2008-03-12T19:54:21Z","messageCount":1,"participants":["Marc-Andre Lureau"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"71835","messageId":"1205351661-6384-1-git-send-email-marcandre.lureau@gmail.com","threadId":"12654","inReplyTo":null,"subject":"[PATCH] git-cvsimport: fix merging with remote parent branch","fromName":"Marc-Andre Lureau","fromEmail":"marcandre.lureau@gmail.com","sentAt":"2008-03-12T19:54:21Z","receivedAt":"2008-03-12T19:54:21Z","isPatch":true,"sender":{"key":"marcandre.lureau@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9381?v=4"},"body":"commit-tree fails when specifying a remote name (via -r option) and\none of the parent branch has a name. Prefixing with \"$remote/\" fix it.\n\nSigned-off-by: Marc-Andre Lureau <marcandre.lureau@gmail.com>\n---\n git-cvsimport.perl |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-cvsimport.perl b/git-cvsimport.perl\nindex 47f116f..95c5eec 100755\n--- a/git-cvsimport.perl\n+++ b/git-cvsimport.perl\n@@ -735,7 +735,7 @@ sub commit {\n \t\tnext unless $logmsg =~ $rx && $1;\n \t\tmy $mparent = $1 eq 'HEAD' ? $opt_o : $1;\n \t\tif (my $sha1 = get_headref(\"$remote/$mparent\")) {\n-\t\t\tpush @commit_args, '-p', $mparent;\n+\t\t\tpush @commit_args, '-p', \"$remote/$mparent\";\n \t\t\tprint \"Merge parent branch: $mparent\\n\" if $opt_v;\n \t\t}\n \t}\n-- \n1.5.4.4.534.gfb90c.dirty\n"}]}