checkout: don't crash on file checkout before running post-checkout hook
In the case of git init echo exit >.git/hooks/post-checkout chmod +x .git/hooks/post-checkout touch foo git add foo rm foo git checkout -- foo git-checkout resulted in a Segmentation fault, because there is no new branch set for the post-checkout hook. This patch makes use of the null SHA as it is set for the old branch. While at it, I removed the xstrdup() around the sha1_to_hex(...) calls in builtin-checkout.c/post_checkout_hook() because sha1_to_hex() uses four buffers for the hex-dumped SHA and we only need two. (Duplicating one buffer is only needed if we need more than four.) Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephan Beyer committed
Jan 16, 2009 at 20:09 UTC
2292ce4785170d5502c4c9ea860bb73c6379f029
1 file changed
+4
-2
builtin-checkout.c
+4
-2
@@ -47,8 +47,10 @@ static int post_checkout_hook(struct commit *old, struct commit *new,
47
48
memset(&proc, 0, sizeof(proc));
49
argv[0] = name;
50
- argv[1] = xstrdup(sha1_to_hex(old ? old->object.sha1 : null_sha1));
51
- argv[2] = xstrdup(sha1_to_hex(new->object.sha1));
50
+ argv[1] = sha1_to_hex(old ? old->object.sha1 : null_sha1);
51
+ argv[2] = sha1_to_hex(new ? new->object.sha1 : null_sha1);
52
+ /* "new" can be NULL when checking out from the index before
53
+ a commit exists. */
54
argv[3] = changed ? "1" : "0";
55
argv[4] = NULL;
56
proc.argv = argv;