diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
| commit | 11e4b4fa49ff3221c9d07a877af6c73b619e9934 (patch) | |
| tree | 6fc6a7f10b14013b6d8a57283fab93ceb3cfa355 /t | |
| parent | Merge branch 'nd/hash-object-sanity' (diff) | |
| parent | merge: honor prepare-commit-msg hook (diff) | |
| download | tgif-11e4b4fa49ff3221c9d07a877af6c73b619e9934.tar.xz | |
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'
* js/maint-merge-use-prepare-commit-msg-hook:
merge: honor prepare-commit-msg hook
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7505-prepare-commit-msg-hook.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh index ff189624d4..5b4b694f18 100755 --- a/t/t7505-prepare-commit-msg-hook.sh +++ b/t/t7505-prepare-commit-msg-hook.sh @@ -132,6 +132,18 @@ test_expect_success 'with hook (-c)' ' ' +test_expect_success 'with hook (merge)' ' + + head=`git rev-parse HEAD` && + git checkout -b other HEAD@{1} && + echo "more" >> file && + git add file && + git commit -m other && + git checkout - && + git merge other && + test "`git log -1 --pretty=format:%s`" = merge +' + cat > "$HOOK" <<'EOF' #!/bin/sh exit 1 |