diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:48:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:48:31 -0700 |
| commit | 8a396c02fdc7efa787be20074ae08059e3f80d14 (patch) | |
| tree | ded06b289654542e0f59bfa3619b577b0c94d8d8 | |
| parent | 5a5bd23486c5d8721f4654eadec75213d3dc074f (diff) | |
| parent | dfa7a6c579d75037b9dd5c3654a36d31c60f203c (diff) | |
| download | git-8a396c02fdc7efa787be20074ae08059e3f80d14.tar.gz git-8a396c02fdc7efa787be20074ae08059e3f80d14.tar.xz | |
Merge branch 'jk/clone-post-checkout'
* jk/clone-post-checkout:
clone: run post-checkout hook when checking out
| -rw-r--r-- | builtin-clone.c | 7 | ||||
| -rwxr-xr-x | t/t5403-post-checkout-hook.sh | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/builtin-clone.c b/builtin-clone.c index 92826cd14..39523cee3 100644 --- a/builtin-clone.c +++ b/builtin-clone.c @@ -20,6 +20,7 @@ #include "dir.h" #include "pack-refs.h" #include "sigchain.h" +#include "run-command.h" /* * Overall FIXMEs: @@ -375,6 +376,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT; struct transport *transport = NULL; char *src_ref_prefix = "refs/heads/"; + int err = 0; struct refspec refspec; @@ -625,6 +627,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (write_cache(fd, active_cache, active_nr) || commit_locked_index(lock_file)) 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); } strbuf_release(&reflog_msg); @@ -632,5 +637,5 @@ int cmd_clone(int argc, const char **argv, const char *prefix) strbuf_release(&key); strbuf_release(&value); junk_pid = 0; - return 0; + return err; } diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh index 9b2e1a94c..4fdb41855 100755 --- a/t/t5403-post-checkout-hook.sh +++ b/t/t5403-post-checkout-hook.sh @@ -71,4 +71,16 @@ test_expect_success 'post-checkout receives the right args when not switching br test $old = $new -a $flag = 0 ' +mkdir -p templates/hooks +cat >templates/hooks/post-checkout <<'EOF' +#!/bin/sh +echo $@ > $GIT_DIR/post-checkout.args +EOF +chmod +x templates/hooks/post-checkout + +test_expect_success 'post-checkout hook is triggered by clone' ' + git clone --template=templates . clone3 && + test -f clone3/.git/post-checkout.args +' + test_done |