clone: Supply the right commit hash to post-checkout when -b is used

When we use -b <branch>, we may checkout something else than what the remote's HEAD references, but we still used remote_head to supply the new ref value to the post-checkout hook, which is wrong. So instead of using remote_head to find the value to be passed to the post-checkout hook, we have to use our_head_points_at, which is always correctly setup, even if -b is not used. This also fixes a segfault when "clone -b <branch>" is used with a remote repo that doesn't have a valid HEAD, as in such a case remote_head is NULL, but we still tried to access it. Reported-by: Devin Cofer <ranguvar@archlinux.us> Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Björn Steinbrink committed Oct 14, 2009 at 00:11 UTC d01a8e32fe10f1086e5e427f85237baff218fb01

2 files changed +3 -1

builtin-clone.c

+2 -1

@@ -641,7 +641,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)

641 die("unable to write new index file");

642

643 err |= run_hook(NULL, "post-checkout", sha1_to_hex(null_sha1),

644 - sha1_to_hex(remote_head->old_sha1), "1", NULL);

644 + sha1_to_hex(our_head_points_at->old_sha1), "1",

645 + NULL);

646

647 if (!err && option_recursive)

648 err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);

remote-curl.c

@@ -3,6 +3,7 @@

3 #include "strbuf.h"

4 #include "walker.h"

5 #include "http.h"

6 +#include "exec_cmd.h"

8 static struct ref *get_refs(struct walker *walker, const char *url)

9 {