rebase: use correct base for --keep-base when a branch is given
[alt-git.git] / t / t5402-post-merge-hook.sh
blob915af2de95e162a9581ca23a6efb229737e665a6
1 #!/bin/sh
3 # Copyright (c) 2006 Josh England
6 test_description='Test the post-merge hook.'
7 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
8 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10 . ./test-lib.sh
12 test_expect_success setup '
13 echo Data for commit0. >a &&
14 git update-index --add a &&
15 tree0=$(git write-tree) &&
16 commit0=$(echo setup | git commit-tree $tree0) &&
17 echo Changed data for commit1. >a &&
18 git update-index a &&
19 tree1=$(git write-tree) &&
20 commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
21 git update-ref refs/heads/main $commit0 &&
22 git clone ./. clone1 &&
23 GIT_DIR=clone1/.git git update-index --add a &&
24 git clone ./. clone2 &&
25 GIT_DIR=clone2/.git git update-index --add a
28 test_expect_success 'setup clone hooks' '
29 test_when_finished "rm -f hook" &&
30 cat >hook <<-\EOF &&
31 echo $@ >>$GIT_DIR/post-merge.args
32 EOF
34 test_hook --setup -C clone1 post-merge <hook &&
35 test_hook --setup -C clone2 post-merge <hook
38 test_expect_success 'post-merge does not run for up-to-date ' '
39 GIT_DIR=clone1/.git git merge $commit0 &&
40 ! test -f clone1/.git/post-merge.args
43 test_expect_success 'post-merge runs as expected ' '
44 GIT_DIR=clone1/.git git merge $commit1 &&
45 test -e clone1/.git/post-merge.args
48 test_expect_success 'post-merge from normal merge receives the right argument ' '
49 grep 0 clone1/.git/post-merge.args
52 test_expect_success 'post-merge from squash merge runs as expected ' '
53 GIT_DIR=clone2/.git git merge --squash $commit1 &&
54 test -e clone2/.git/post-merge.args
57 test_expect_success 'post-merge from squash merge receives the right argument ' '
58 grep 1 clone2/.git/post-merge.args
61 test_done