projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7ed863a) | patch
merge: honor prepare-commit-msg hook
authorJay Soffian <jaysoffian@gmail.com>
Tue, 15 Feb 2011 01:07:50 +0000 (20:07 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Feb 2011 21:35:35 +0000 (13:35 -0800)
commit65969d43d10512a44f5e7248e4404b946d1d0d9f
tree9b9d06d73f8fa67afb230c42959de0c33bfbf3fdtree | snapshot
parent7ed863a85a6ce2c4ac4476848310b8f917ab41f9commit | diff
merge: honor prepare-commit-msg hook

When a merge is stopped due to conflicts or --no-commit, the
subsequent commit calls the prepare-commit-msg hook. However,
it is not called after a clean merge. Fix this inconsistency
by invoking the hook after clean merges as well.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c diff | blob | history
t/t7505-prepare-commit-msg-hook.sh diff | blob | history
Git—the stupid content tracker