Skip to content
Permalink
Browse files

Merge pull request #1992 from orgads/rebase-post-checkout-hook

Rebase: Run post-checkout hook on checkout
  • Loading branch information...
dscho committed Dec 21, 2018
2 parents 7c9fbc0 + 93f5484 commit 7b95654d1c9722e4a9be496471e0186ff55e46f9
Showing with 43 additions and 38 deletions.
  1. +7 −1 builtin/rebase.c
  2. +36 −37 t/t5403-post-checkout-hook.sh
@@ -369,6 +369,7 @@ static void add_var(struct strbuf *buf, const char *name, const char *value)
#define RESET_HEAD_DETACH (1<<0)
#define RESET_HEAD_HARD (1<<1)
#define RESET_HEAD_REFS_ONLY (1<<2)
#define RESET_HEAD_RUN_HOOK (1<<3)

static int reset_head(struct object_id *oid, const char *action,
const char *switch_to_branch, unsigned flags,
@@ -377,6 +378,7 @@ static int reset_head(struct object_id *oid, const char *action,
unsigned detach_head = flags & RESET_HEAD_DETACH;
unsigned reset_hard = flags & RESET_HEAD_HARD;
unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
unsigned run_hook = flags & RESET_HEAD_RUN_HOOK;
struct object_id head_oid;
struct tree_desc desc[2] = { { NULL }, { NULL } };
struct lock_file lock = LOCK_INIT;
@@ -481,6 +483,10 @@ static int reset_head(struct object_id *oid, const char *action,
ret = create_symref("HEAD", switch_to_branch,
reflog_head);
}
if (run_hook)
run_hook_le(NULL, "post-checkout",
oid_to_hex(orig ? orig : &null_oid),
oid_to_hex(oid), "1", NULL);

leave_reset_head:
strbuf_release(&msg);
@@ -1729,7 +1735,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_addf(&msg, "%s: checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
if (reset_head(&options.onto->object.oid, "checkout", NULL,
RESET_HEAD_DETACH, NULL, msg.buf))
RESET_HEAD_DETACH | RESET_HEAD_RUN_HOOK, NULL, msg.buf))
die(_("Could not detach HEAD"));
strbuf_release(&msg);

@@ -7,70 +7,69 @@ test_description='Test the post-checkout hook.'
. ./test-lib.sh

test_expect_success setup '
echo Data for commit0. >a &&
echo Data for commit0. >b &&
git update-index --add a &&
git update-index --add b &&
tree0=$(git write-tree) &&
commit0=$(echo setup | git commit-tree $tree0) &&
git update-ref refs/heads/master $commit0 &&
git clone ./. clone1 &&
git clone ./. clone2 &&
GIT_DIR=clone2/.git git branch new2 &&
echo Data for commit1. >clone2/b &&
GIT_DIR=clone2/.git git add clone2/b &&
GIT_DIR=clone2/.git git commit -m new2
test_commit one &&
test_commit two &&
test_commit rebase-on-me &&
git reset --hard HEAD^ &&
test_commit three three &&
mv .git/hooks-disabled .git/hooks
'

for clone in 1 2; do
cat >clone${clone}/.git/hooks/post-checkout <<'EOF'
cat >.git/hooks/post-checkout <<'EOF'
#!/bin/sh
echo $@ > $GIT_DIR/post-checkout.args
echo $@ > .git/post-checkout.args
EOF
chmod u+x clone${clone}/.git/hooks/post-checkout
done
chmod u+x .git/hooks/post-checkout

test_expect_success 'post-checkout runs as expected ' '
GIT_DIR=clone1/.git git checkout master &&
test -e clone1/.git/post-checkout.args
git checkout master &&
test -e .git/post-checkout.args
'

test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
old=$(awk "{print \$1}" clone1/.git/post-checkout.args) &&
new=$(awk "{print \$2}" clone1/.git/post-checkout.args) &&
flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) &&
read old new flag < .git/post-checkout.args &&
test $old = $new && test $flag = 1
'

test_expect_success 'post-checkout runs as expected ' '
GIT_DIR=clone1/.git git checkout master &&
test -e clone1/.git/post-checkout.args
git checkout master &&
test -e .git/post-checkout.args
'

test_expect_success 'post-checkout args are correct with git checkout -b ' '
GIT_DIR=clone1/.git git checkout -b new1 &&
old=$(awk "{print \$1}" clone1/.git/post-checkout.args) &&
new=$(awk "{print \$2}" clone1/.git/post-checkout.args) &&
flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) &&
git checkout -b new1 &&
read old new flag < .git/post-checkout.args &&
test $old = $new && test $flag = 1
'

test_expect_success 'post-checkout receives the right args with HEAD changed ' '
GIT_DIR=clone2/.git git checkout new2 &&
old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
git checkout two &&
read old new flag < .git/post-checkout.args &&
test $old != $new && test $flag = 1
'

test_expect_success 'post-checkout receives the right args when not switching branches ' '
GIT_DIR=clone2/.git git checkout master b &&
old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
git checkout master -- three &&
read old new flag < .git/post-checkout.args &&
test $old = $new && test $flag = 0
'

test_expect_success 'post-checkout is triggered on rebase' '
git checkout -b rebase-test master &&
rm -f .git/post-checkout.args &&
git rebase rebase-on-me &&
read old new flag < .git/post-checkout.args &&
test $old != $new && test $flag = 1
'

test_expect_success 'post-checkout is triggered on rebase with fast-forward' '
git checkout -b ff-rebase-test rebase-on-me^ &&
rm -f .git/post-checkout.args &&
git rebase rebase-on-me &&
read old new flag < .git/post-checkout.args &&
test $old != $new && test $flag = 1
'

if test "$(git config --bool core.filemode)" = true; then
mkdir -p templates/hooks
cat >templates/hooks/post-checkout <<'EOF'

0 comments on commit 7b95654

Please sign in to comment.
You can’t perform that action at this time.