summaryrefslogtreecommitdiff
path: root/t/t1505-rev-parse-last.sh
diff options
context:
space:
mode:
authorLibravatar Antoine Pelisse <apelisse@gmail.com>2013-01-02 19:42:50 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 09:10:11 -0800
commit3e4141d08c8dc1964d53c2ce13de8876d29e6436 (patch)
tree44211fc071d585ac9ab7700d48c4f7e31baa322d /t/t1505-rev-parse-last.sh
parentGit 1.8.0.3 (diff)
downloadtgif-3e4141d08c8dc1964d53c2ce13de8876d29e6436.tar.xz
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>
Diffstat (limited to 't/t1505-rev-parse-last.sh')
0 files changed, 0 insertions, 0 deletions