{"thread":{"id":"22102","subject":"Re: checkout -m dumping core","startedAt":"2010-01-06T08:20:34Z","lastAt":"2010-01-06T08:20:34Z","messageCount":1,"participants":["Daniel"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"130903","messageId":"262d5577.e4806de.4b4447d2.6079e@o2.pl","threadId":"22102","inReplyTo":null,"subject":"Re: checkout -m dumping core","fromName":"Daniel","fromEmail":"mjucde@o2.pl","sentAt":"2010-01-06T08:20:34Z","receivedAt":"2010-01-06T08:20:34Z","isPatch":false,"sender":{"key":"mjucde@o2.pl","avatar":null},"body":"Argh, this one is better... (does not contain !). Stupid typo :/\n\n---\nFrom b2203bded22db1a496ee3c9f6f5f4a384a8ccefa Mon Sep 17 00:00:00 2001\nFrom: Daniel Baranski <mjucde@o2.pl>\nDate: Wed, 6 Jan 2010 08:58:21 +0100\nSubject: [PATCH] checkout -m: Fix SEGFAULT if HEAD is not valid.\n\nSigned-off-by: Daniel Barański <mjucde@o2.pl>\n---\n builtin-checkout.c |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-checkout.c b/builtin-checkout.c\nindex 64f3a11..0ab59b2 100644\n--- a/builtin-checkout.c\n+++ b/builtin-checkout.c\n@@ -422,7 +422,8 @@ static int merge_working_tree(struct checkout_opts\n*opts,\n                        struct merge_options o;\n                        if (!opts->merge)\n                                return 1;\n-                       parse_commit(old->commit);\n+                       if (parse_commit(old->commit))\n+                               die(\"Couldn't parse commit '%s'\",\nold->path);\n\n                        /* Do more real merge */\n\n-- \n1.6.5.6\n"}]}