mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
3e4141d08c
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>
185 lines
3.7 KiB
Bash
Executable file
185 lines
3.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='prepare-commit-msg hook'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'with no hook' '
|
|
|
|
echo "foo" > file &&
|
|
git add file &&
|
|
git commit -m "first"
|
|
|
|
'
|
|
|
|
# set up fake editor for interactive editing
|
|
cat > fake-editor <<'EOF'
|
|
#!/bin/sh
|
|
exit 0
|
|
EOF
|
|
chmod +x fake-editor
|
|
|
|
## Not using test_set_editor here so we can easily ensure the editor variable
|
|
## is only set for the editor tests
|
|
FAKE_EDITOR="$(pwd)/fake-editor"
|
|
export FAKE_EDITOR
|
|
|
|
# now install hook that always succeeds and adds a message
|
|
HOOKDIR="$(git rev-parse --git-dir)/hooks"
|
|
HOOK="$HOOKDIR/prepare-commit-msg"
|
|
mkdir -p "$HOOKDIR"
|
|
echo "#!$SHELL_PATH" > "$HOOK"
|
|
cat >> "$HOOK" <<'EOF'
|
|
|
|
if test "$2" = commit; then
|
|
source=$(git rev-parse "$3")
|
|
else
|
|
source=${2-default}
|
|
fi
|
|
if test "$GIT_EDITOR" = :; then
|
|
sed -e "1s/.*/$source (no editor)/" "$1" > msg.tmp
|
|
else
|
|
sed -e "1s/.*/$source/" "$1" > msg.tmp
|
|
fi
|
|
mv msg.tmp "$1"
|
|
exit 0
|
|
EOF
|
|
chmod +x "$HOOK"
|
|
|
|
echo dummy template > "$(git rev-parse --git-dir)/template"
|
|
|
|
test_expect_success 'with hook (-m)' '
|
|
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
git commit -m "more" &&
|
|
test "`git log -1 --pretty=format:%s`" = "message (no editor)"
|
|
|
|
'
|
|
|
|
test_expect_success 'with hook (-m editor)' '
|
|
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -m "more more" &&
|
|
test "`git log -1 --pretty=format:%s`" = message
|
|
|
|
'
|
|
|
|
test_expect_success 'with hook (-t)' '
|
|
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
git commit -t "$(git rev-parse --git-dir)/template" &&
|
|
test "`git log -1 --pretty=format:%s`" = template
|
|
|
|
'
|
|
|
|
test_expect_success 'with hook (-F)' '
|
|
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
(echo more | git commit -F -) &&
|
|
test "`git log -1 --pretty=format:%s`" = "message (no editor)"
|
|
|
|
'
|
|
|
|
test_expect_success 'with hook (-F editor)' '
|
|
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
(echo more more | GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -F -) &&
|
|
test "`git log -1 --pretty=format:%s`" = message
|
|
|
|
'
|
|
|
|
test_expect_success 'with hook (-C)' '
|
|
|
|
head=`git rev-parse HEAD` &&
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
git commit -C $head &&
|
|
test "`git log -1 --pretty=format:%s`" = "$head (no editor)"
|
|
|
|
'
|
|
|
|
test_expect_success 'with hook (editor)' '
|
|
|
|
echo "more more" >> file &&
|
|
git add file &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
|
|
test "`git log -1 --pretty=format:%s`" = default
|
|
|
|
'
|
|
|
|
test_expect_success 'with hook (--amend)' '
|
|
|
|
head=`git rev-parse HEAD` &&
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --amend &&
|
|
test "`git log -1 --pretty=format:%s`" = "$head"
|
|
|
|
'
|
|
|
|
test_expect_success 'with hook (-c)' '
|
|
|
|
head=`git rev-parse HEAD` &&
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head &&
|
|
test "`git log -1 --pretty=format:%s`" = "$head"
|
|
|
|
'
|
|
|
|
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
|
|
EOF
|
|
|
|
test_expect_success 'with failing hook' '
|
|
|
|
head=`git rev-parse HEAD` &&
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
|
|
|
|
'
|
|
|
|
test_expect_success 'with failing hook (--no-verify)' '
|
|
|
|
head=`git rev-parse HEAD` &&
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
|
|
|
|
'
|
|
|
|
test_expect_success 'with failing hook (merge)' '
|
|
|
|
git checkout -B other HEAD@{1} &&
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
rm -f "$HOOK" &&
|
|
git commit -m other &&
|
|
write_script "$HOOK" <<-EOF
|
|
exit 1
|
|
EOF
|
|
git checkout - &&
|
|
test_must_fail git merge other
|
|
|
|
'
|
|
|
|
test_done
|