diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:25 -0700 |
| commit | 5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24 (patch) | |
| tree | 36d150c5b966cbfc9f06e6d2a67554e6aafb4a84 /t | |
| parent | 6affdbe677c4b2b8547bd9aa471464dd31a94a1c (diff) | |
| parent | 65969d43d10512a44f5e7248e4404b946d1d0d9f (diff) | |
| download | git-5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24.tar.gz git-5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24.tar.xz | |
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint
* 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 ff189624d..5b4b694f1 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 |