Argh, this one is better... (does not contain !). Stupid typo :/
---
From b2203bded22db1a496ee3c9f6f5f4a384a8ccefa Mon Sep 17 00:00:00 2001
From: Daniel Baranski <mjucde@o2.pl>
Date: Wed, 6 Jan 2010 08:58:21 +0100
Subject: [PATCH] checkout -m: Fix SEGFAULT if HEAD is not valid.
Signed-off-by: Daniel Barański <mjucde@o2.pl>
---
builtin-checkout.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 64f3a11..0ab59b2 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -422,7 +422,8 @@ static int merge_working_tree(struct checkout_opts
*opts,
struct merge_options o;
if (!opts->merge)
return 1;
- parse_commit(old->commit);
+ if (parse_commit(old->commit))
+ die("Couldn't parse commit '%s'",
old->path);
/* Do more real merge */
--
1.6.5.6