3 test_description='server update trac ticket enforcer via shim'
7 test_expect_success 'setup' '
10 git commit -m "setup" &&
11 git clone ./. server &&
12 rm -fr server/.git/hooks &&
13 git remote add origin ./server &&
14 git config --add branch.master.remote origin &&
15 git config --add branch.master.merge refs/heads/master
19 install_server_hook 'update-ensure-ticket-reference' 'update'
21 test_expect_success 'accept merge with merge message' '
22 git checkout -b topic1 master &&
23 echo "$test_name" >a1 &&
25 git commit -m "$test_name topic1 re #1" &&
26 git push origin topic1 &&
28 git checkout -b topic2 master &&
29 echo "$test_name" >a2 &&
31 git commit -m "$test_name topic2 re #2" &&
32 git push origin topic2 &&
34 git checkout topic1 &&
35 echo "$test_name" >>a1 &&
36 git commit -a -m "$test_name topic1 re #1 again" &&