Antoine Pelisse 3e4141d08c merge: Honor prepare-commit-msg return code ... 65969d4 (merge: honor prepare-commit-msg hook, 2011-02-14) tried to make "git commit" and "git merge" consistent, because a merge that required user assistance has to be concluded with "git commit", but back then only "git commit" triggered prepare-commit-msg hook. When it added a call to run the prepare-commit-msg hook, however, it forgot to check the exit code from the hook like "git commit" does, and ended up replacing one inconsistency with another. When prepare-commit-msg hook that is run from "git merge" exits with a non-zero status, abort the commit. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2013-01-03 09:10:11 -08:00
..
add.c	Merge branch 'rj/path-cleanup'	2012-09-14 11:53:53 -07:00
annotate.c
apply.c	Merge branch 'maint-1.7.11' into maint	2012-09-12 14:08:05 -07:00
archive.c	Reduce translations by using same terminologies	2012-08-22 12:02:28 -07:00
bisect--helper.c	i18n: bisect--helper: mark parseopt strings for translation	2012-08-20 12:23:15 -07:00
blame.c	Merge branch 'jc/maint-blame-no-such-path' into maint	2012-09-24 12:40:02 -07:00
branch.c	branch: show targets of deleted symrefs, not sha1s	2012-10-18 14:36:17 -07:00
bundle.c
cat-file.c	Merge branch 'maint-1.7.11' into maint	2012-09-10 15:31:06 -07:00
check-attr.c	Merge branch 'maint'	2012-09-17 15:59:34 -07:00
check-ref-format.c
checkout-index.c	Use imperative form in help usage to describe an action	2012-08-22 12:02:28 -07:00
checkout.c	checkout: print a message when switching unborn branches	2012-11-15 17:36:26 -08:00
clean.c	i18n: clean: mark parseopt strings for translation	2012-08-20 12:23:16 -07:00
clone.c	Merge branch 'rt/maint-clone-single' into maint	2012-10-08 11:34:02 -07:00
column.c	i18n: column: mark parseopt strings for translation	2012-08-20 12:23:16 -07:00
commit-tree.c	Merge branch 'kk/maint-commit-tree'	2012-07-23 20:55:54 -07:00
commit.c	Merge branch 'os/commit-submodule-ignore' into maint	2012-10-08 11:34:34 -07:00
config.c	Merge branch 'cn/config-missing-path' into maint	2012-11-25 18:35:46 -08:00
count-objects.c	i18n: count-objects: mark parseopt strings for translation	2012-08-20 12:23:16 -07:00
credential.c	git credential fill: output the whole 'struct credential'	2012-06-25 11:56:24 -07:00
describe.c	i18n: describe: mark parseopt strings for translation	2012-08-20 12:23:16 -07:00
diff-files.c
diff-index.c
diff-tree.c
diff.c	Merge branch 'tr/void-diff-setup-done' into maint-1.7.11	2012-09-11 10:53:40 -07:00
fast-export.c	i18n: fast-export: mark parseopt strings for translation	2012-08-20 12:23:16 -07:00
fetch-pack.c	fetch-pack: eliminate spurious error messages	2012-09-12 11:46:32 -07:00
fetch.c	Merge branch 'dj/fetch-all-tags' into maint	2012-09-24 12:39:21 -07:00
fmt-merge-msg.c	i18n: fmt-merge-msg: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
for-each-ref.c	Merge branch 'nd/i18n-parseopt-help'	2012-09-07 11:09:09 -07:00
fsck.c	i18n: fsck: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
gc.c	silence git gc --auto --quiet output	2012-09-27 17:57:26 -07:00
grep.c	Merge branch 'nd/grep-true-path' into maint	2012-11-18 19:32:30 -08:00
hash-object.c	i18n: hash-object: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
help.c	i18n: help: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
index-pack.c	i18n: mark more index-pack strings for translation	2012-08-31 13:05:05 -07:00
init-db.c	i18n: init-db: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
log.c	Merge branch 'mz/cherry-pick-cmdline-order' into maint	2012-09-14 21:24:18 -07:00
ls-files.c	i18n: ls-files: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
ls-remote.c	ls-remote: document the '--get-url' option	2012-09-07 10:58:35 -07:00
ls-tree.c	i18n: ls-tree: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
mailinfo.c	Merge branch 'jc/same-encoding' into maint	2012-12-07 14:10:56 -08:00
mailsplit.c
merge-base.c	Merge branch 'jc/merge-bases'	2012-09-11 11:36:05 -07:00
merge-file.c	i18n: merge-file: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	merge: Honor prepare-commit-msg return code	2013-01-03 09:10:11 -08:00
mktag.c
mktree.c	i18n: mktree: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
mv.c	i18n: mv: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
name-rev.c	i18n: name-rev: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
notes.c	builtin/notes.c: mark file-scope private symbols as static	2012-09-15 22:58:20 -07:00
pack-objects.c	i18n: pack-objects: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
pack-redundant.c	Fix sizeof usage in get_permutations	2012-12-13 11:13:44 -08:00
pack-refs.c	i18n: pack-refs: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
patch-id.c
prune-packed.c	i18n: prune-packed: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
prune.c	Merge branch 'rj/path-cleanup'	2012-09-14 11:53:53 -07:00
push.c	Merge branch 'nd/i18n-parseopt-help'	2012-09-07 11:09:09 -07:00
read-tree.c	i18n: read-tree: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
receive-pack.c	Merge branch 'jk/receive-pack-unpack-error-to-pusher'	2012-10-01 12:58:34 -07:00
reflog.c	reflog: remove i18n legos in pruning message	2012-06-07 11:49:16 -07:00
remote-ext.c
remote-fd.c
remote.c	Fix typo in remote set-head usage	2012-11-26 13:27:45 -08:00
replace.c	i18n: replace: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
rerere.c	i18n: rerere: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
reset.c	i18n: reset: mark parseopt strings for translation	2012-08-20 12:23:19 -07:00
rev-list.c
rev-parse.c	Merge branch 'maint-1.7.11' into maint	2012-09-12 14:08:05 -07:00
revert.c	Merge branch 'mz/cherry-pick-cmdline-order'	2012-09-10 15:42:55 -07:00
rm.c	i18n: rm: mark parseopt strings for translation	2012-08-20 12:23:20 -07:00
send-pack.c	do not send client agent unless server does first	2012-08-10 12:35:13 -07:00
shortlog.c	i18n: shortlog: mark parseopt strings for translation	2012-08-20 12:23:20 -07:00
show-branch.c	i18n: show-branch: mark parseopt strings for translation	2012-08-22 10:58:28 -07:00
show-ref.c	i18n: show-ref: mark parseopt strings for translation	2012-08-22 10:58:28 -07:00
stripspace.c
symbolic-ref.c	i18n: symbolic-ref: mark parseopt strings for translation	2012-08-22 10:58:28 -07:00
tag.c	Reduce translations by using same terminologies	2012-08-22 12:02:28 -07:00
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c	i18n: update-index: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00
update-ref.c	Use imperative form in help usage to describe an action	2012-08-22 12:02:28 -07:00
update-server-info.c	i18n: update-server-info: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00
upload-archive.c
var.c	ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT	2012-05-24 17:16:41 -07:00
verify-pack.c	i18n: verify-pack: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00
verify-tag.c	i18n: verify-tag: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00
write-tree.c	i18n: write-tree: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00