Revision 3adab6f3a7793253b22a4a7aae34221d19e0236a authored by Junio C Hamano on 09 February 2012, 21:30:52 UTC, committed by Junio C Hamano on 09 February 2012, 21:30:52 UTC
When the user explicitly asked us not to, don't launch an editor.

But do everything else the same way as the "edit" case, i.e. leave the
comment with verification result in the log template and record the
mergesig in the resulting merge commit for later inspection.

Based on initiail analysis by Jonathan Nieder.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b5c9f1c
History
File Mode Size
.gitignore -rw-r--r-- 22 bytes
Makefile -rw-r--r-- 1.7 KB
branches-- -rw-r--r-- 47 bytes
hooks--applypatch-msg.sample -rwxr-xr-x 452 bytes
hooks--commit-msg.sample -rwxr-xr-x 896 bytes
hooks--post-update.sample -rwxr-xr-x 189 bytes
hooks--pre-applypatch.sample -rwxr-xr-x 398 bytes
hooks--pre-commit.sample -rwxr-xr-x 1.7 KB
hooks--pre-rebase.sample -rwxr-xr-x 4.8 KB
hooks--prepare-commit-msg.sample -rwxr-xr-x 1.2 KB
hooks--update.sample -rwxr-xr-x 3.5 KB
info--exclude -rw-r--r-- 240 bytes
this--description -rw-r--r-- 73 bytes

back to top