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

dotdash · gitster · commit d01a8e32fe10 · 2009-10-14T01:19:15.000-07:00
When we use -b &lt;branch&gt;, 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 &lt;branch&gt;" 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 &lt;ranguvar@archlinux.us&gt;
Signed-off-by: Björn Steinbrink &lt;B.Steinbrink@gmx.de&gt;
Acked-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-clone.c b/builtin-clone.c
@@ -641,7 +641,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 			die("unable to write new index file");
 
 		err |= run_hook(NULL, "post-checkout", sha1_to_hex(null_sha1),
-				sha1_to_hex(remote_head->old_sha1), "1", NULL);
+				sha1_to_hex(our_head_points_at->old_sha1), "1",
+				NULL);
 
 		if (!err && option_recursive)
 			err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);
diff --git a/remote-curl.c b/remote-curl.c
@@ -3,6 +3,7 @@
 #include "strbuf.h"
 #include "walker.h"
 #include "http.h"
+#include "exec_cmd.h"
 
 static struct ref *get_refs(struct walker *walker, const char *url)
 {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#include "strbuf.h"`
`4`	`4`	`#include "walker.h"`
`5`	`5`	`#include "http.h"`
	`6`	`+#include "exec_cmd.h"`
`6`	`7`
`7`	`8`	`static struct ref get_refs(struct walker walker, const char *url)`
`8`	`9`	`{`