{"thread":{"id":"4775","subject":"[PATCH] git-cvsexportcommit dies on merge commits","startedAt":"2006-07-05T13:25:04Z","lastAt":"2006-07-05T13:25:04Z","messageCount":1,"participants":["Peter Baumann"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"23277","messageId":"20060705132504.GA3470@xp.machine.xx","threadId":"4775","inReplyTo":null,"subject":"[PATCH] git-cvsexportcommit dies on merge commits","fromName":"Peter Baumann","fromEmail":"siprbaum@stud.informatik.uni-erlangen.de","sentAt":"2006-07-05T13:25:04Z","receivedAt":"2006-07-05T13:25:04Z","isPatch":true,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"Signed-off-by: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de>\n---\n git-cvsexportcommit.perl |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl\nindex d1051d0..5dcb2f9 100755\n--- a/git-cvsexportcommit.perl\n+++ b/git-cvsexportcommit.perl\n@@ -63,15 +63,15 @@ foreach my $p (@commit) {\n }\n \n if ($parent) {\n+    my $found;\n     # double check that it's a valid parent\n     foreach my $p (@parents) {\n-\tmy $found;\n \tif ($p eq $parent) {\n \t    $found = 1;\n \t    last;\n \t}; # found it\n-\tdie \"Did not find $parent in the parents for this commit!\";\n     }\n+    die \"Did not find $parent in the parents for this commit!\" if !$found;\n } else { # we don't have a parent from the cmdline...\n     if (@parents == 1) { # it's safe to get it from the commit\n \t$parent = $parents[0];\n-- \n1.4.0\n"}]}