2008-02-05 08:04:18 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='prepare-commit-msg hook'
|
|
|
|
|
2020-11-19 00:44:40 +01:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-19 00:44:19 +01:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2008-02-05 08:04:18 +01:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2018-01-24 13:34:21 +01:00
|
|
|
test_expect_success 'set up commits for rebasing' '
|
|
|
|
test_commit root &&
|
|
|
|
test_commit a a a &&
|
|
|
|
test_commit b b b &&
|
|
|
|
git checkout -b rebase-me root &&
|
|
|
|
test_commit rebase-a a aa &&
|
|
|
|
test_commit rebase-b b bb &&
|
|
|
|
for i in $(test_seq 1 13)
|
|
|
|
do
|
|
|
|
test_commit rebase-$i c $i
|
|
|
|
done &&
|
2020-11-19 00:44:40 +01:00
|
|
|
git checkout main &&
|
2018-01-24 13:34:21 +01:00
|
|
|
|
|
|
|
cat >rebase-todo <<-EOF
|
|
|
|
pick $(git rev-parse rebase-a)
|
|
|
|
pick $(git rev-parse rebase-b)
|
|
|
|
fixup $(git rev-parse rebase-1)
|
|
|
|
fixup $(git rev-parse rebase-2)
|
|
|
|
pick $(git rev-parse rebase-3)
|
|
|
|
fixup $(git rev-parse rebase-4)
|
|
|
|
squash $(git rev-parse rebase-5)
|
|
|
|
reword $(git rev-parse rebase-6)
|
|
|
|
squash $(git rev-parse rebase-7)
|
|
|
|
fixup $(git rev-parse rebase-8)
|
|
|
|
fixup $(git rev-parse rebase-9)
|
|
|
|
edit $(git rev-parse rebase-10)
|
|
|
|
squash $(git rev-parse rebase-11)
|
|
|
|
squash $(git rev-parse rebase-12)
|
|
|
|
edit $(git rev-parse rebase-13)
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
2008-02-05 08:04:18 +01:00
|
|
|
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
|
2008-05-04 07:37:59 +02:00
|
|
|
|
|
|
|
## Not using test_set_editor here so we can easily ensure the editor variable
|
|
|
|
## is only set for the editor tests
|
2008-02-05 08:04:18 +01:00
|
|
|
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"
|
2008-03-12 22:42:43 +01:00
|
|
|
echo "#!$SHELL_PATH" > "$HOOK"
|
|
|
|
cat >> "$HOOK" <<'EOF'
|
|
|
|
|
2018-01-24 13:34:21 +01:00
|
|
|
GIT_DIR=$(git rev-parse --git-dir)
|
|
|
|
if test -d "$GIT_DIR/rebase-merge"
|
|
|
|
then
|
|
|
|
rebasing=1
|
|
|
|
else
|
|
|
|
rebasing=0
|
|
|
|
fi
|
|
|
|
|
|
|
|
get_last_cmd () {
|
|
|
|
tail -n1 "$GIT_DIR/rebase-merge/done" | {
|
|
|
|
read cmd id _
|
|
|
|
git log --pretty="[$cmd %s]" -n1 $id
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-01-24 13:34:20 +01:00
|
|
|
if test "$2" = commit
|
|
|
|
then
|
2018-01-24 13:34:21 +01:00
|
|
|
if test $rebasing = 1
|
|
|
|
then
|
|
|
|
source="$3"
|
|
|
|
else
|
|
|
|
source=$(git rev-parse "$3")
|
|
|
|
fi
|
2008-02-05 08:04:18 +01:00
|
|
|
else
|
2018-01-24 13:34:20 +01:00
|
|
|
source=${2-default}
|
2008-02-05 08:04:18 +01:00
|
|
|
fi
|
2018-01-24 13:34:21 +01:00
|
|
|
test "$GIT_EDITOR" = : && source="$source (no editor)"
|
|
|
|
|
|
|
|
if test $rebasing = 1
|
2018-01-24 13:34:20 +01:00
|
|
|
then
|
2018-01-24 13:34:21 +01:00
|
|
|
echo "$source $(get_last_cmd)" >"$1"
|
2008-02-05 08:04:18 +01:00
|
|
|
else
|
2018-01-24 13:34:20 +01:00
|
|
|
sed -e "1s/.*/$source/" "$1" >msg.tmp
|
2018-01-24 13:34:21 +01:00
|
|
|
mv msg.tmp "$1"
|
2008-02-05 08:04:18 +01:00
|
|
|
fi
|
|
|
|
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" &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook (-m editor)' '
|
|
|
|
|
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
2008-05-04 07:37:59 +02:00
|
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -m "more more" &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = message
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook (-t)' '
|
|
|
|
|
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
|
|
|
git commit -t "$(git rev-parse --git-dir)/template" &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = template
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook (-F)' '
|
|
|
|
|
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
|
|
|
(echo more | git commit -F -) &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook (-F editor)' '
|
|
|
|
|
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
2008-05-04 07:37:59 +02:00
|
|
|
(echo more more | GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -F -) &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = message
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook (-C)' '
|
|
|
|
|
2016-01-08 12:06:23 +01:00
|
|
|
head=$(git rev-parse HEAD) &&
|
2008-02-05 08:04:18 +01:00
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
|
|
|
git commit -C $head &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = "$head (no editor)"
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook (editor)' '
|
|
|
|
|
|
|
|
echo "more more" >> file &&
|
|
|
|
git add file &&
|
2008-05-04 07:37:59 +02:00
|
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = default
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook (--amend)' '
|
|
|
|
|
2016-01-08 12:06:23 +01:00
|
|
|
head=$(git rev-parse HEAD) &&
|
2008-02-05 08:04:18 +01:00
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
2008-05-04 07:37:59 +02:00
|
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --amend &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = "$head"
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook (-c)' '
|
|
|
|
|
2016-01-08 12:06:23 +01:00
|
|
|
head=$(git rev-parse HEAD) &&
|
2008-02-05 08:04:18 +01:00
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
2008-05-04 07:37:59 +02:00
|
|
|
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = "$head"
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2011-02-15 02:07:50 +01:00
|
|
|
test_expect_success 'with hook (merge)' '
|
|
|
|
|
2020-11-19 00:44:40 +01:00
|
|
|
test_when_finished "git checkout -f main" &&
|
2014-03-18 11:00:55 +01:00
|
|
|
git checkout -B other HEAD@{1} &&
|
|
|
|
echo "more" >>file &&
|
|
|
|
git add file &&
|
|
|
|
git commit -m other &&
|
|
|
|
git checkout - &&
|
|
|
|
git merge --no-ff other &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = "merge (no editor)"
|
2014-03-18 11:00:55 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook and editor (merge)' '
|
|
|
|
|
2020-11-19 00:44:40 +01:00
|
|
|
test_when_finished "git checkout -f main" &&
|
2014-03-18 11:00:55 +01:00
|
|
|
git checkout -B other HEAD@{1} &&
|
|
|
|
echo "more" >>file &&
|
2011-02-15 02:07:50 +01:00
|
|
|
git add file &&
|
|
|
|
git commit -m other &&
|
|
|
|
git checkout - &&
|
2014-03-18 11:00:55 +01:00
|
|
|
env GIT_EDITOR="\"\$FAKE_EDITOR\"" git merge --no-ff -e other &&
|
2016-01-08 12:06:23 +01:00
|
|
|
test "$(git log -1 --pretty=format:%s)" = "merge"
|
2011-02-15 02:07:50 +01:00
|
|
|
'
|
|
|
|
|
2018-01-24 13:34:21 +01:00
|
|
|
test_rebase () {
|
|
|
|
expect=$1 &&
|
|
|
|
mode=$2 &&
|
2021-02-11 02:53:51 +01:00
|
|
|
test_expect_$expect "with hook (rebase ${mode:--i})" '
|
2018-01-24 13:34:21 +01:00
|
|
|
test_when_finished "\
|
|
|
|
git rebase --abort
|
2020-11-19 00:44:40 +01:00
|
|
|
git checkout -f main
|
2018-01-24 13:34:21 +01:00
|
|
|
git branch -D tmp" &&
|
|
|
|
git checkout -b tmp rebase-me &&
|
|
|
|
GIT_SEQUENCE_EDITOR="cp rebase-todo" &&
|
|
|
|
GIT_EDITOR="\"$FAKE_EDITOR\"" &&
|
|
|
|
(
|
|
|
|
export GIT_SEQUENCE_EDITOR GIT_EDITOR &&
|
2019-01-28 11:27:56 +01:00
|
|
|
test_must_fail git rebase -i $mode b &&
|
2018-01-24 13:34:21 +01:00
|
|
|
echo x >a &&
|
|
|
|
git add a &&
|
|
|
|
test_must_fail git rebase --continue &&
|
|
|
|
echo x >b &&
|
|
|
|
git add b &&
|
|
|
|
git commit &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo y >a &&
|
|
|
|
git add a &&
|
|
|
|
git commit &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo y >b &&
|
|
|
|
git add b &&
|
|
|
|
git rebase --continue
|
|
|
|
) &&
|
2019-08-19 11:18:21 +02:00
|
|
|
git log --pretty=%s -g -n18 HEAD@{1} >actual &&
|
2019-01-28 11:27:56 +01:00
|
|
|
test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual
|
2018-01-24 13:34:21 +01:00
|
|
|
'
|
|
|
|
}
|
|
|
|
|
2019-01-28 11:27:56 +01:00
|
|
|
test_rebase success
|
2018-10-31 21:02:02 +01:00
|
|
|
test_have_prereq !REBASE_P || test_rebase success -p
|
2018-01-24 13:34:21 +01:00
|
|
|
|
2018-01-24 13:34:22 +01:00
|
|
|
test_expect_success 'with hook (cherry-pick)' '
|
2020-11-19 00:44:40 +01:00
|
|
|
test_when_finished "git checkout -f main" &&
|
2018-01-24 13:34:21 +01:00
|
|
|
git checkout -B other b &&
|
|
|
|
git cherry-pick rebase-1 &&
|
|
|
|
test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with hook and editor (cherry-pick)' '
|
2020-11-19 00:44:40 +01:00
|
|
|
test_when_finished "git checkout -f main" &&
|
2018-01-24 13:34:21 +01:00
|
|
|
git checkout -B other b &&
|
|
|
|
git cherry-pick -e rebase-1 &&
|
|
|
|
test "$(git log -1 --pretty=format:%s)" = merge
|
|
|
|
'
|
|
|
|
|
2008-02-05 08:04:18 +01:00
|
|
|
cat > "$HOOK" <<'EOF'
|
|
|
|
#!/bin/sh
|
|
|
|
exit 1
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'with failing hook' '
|
|
|
|
|
2020-11-19 00:44:40 +01:00
|
|
|
test_when_finished "git checkout -f main" &&
|
2016-01-08 12:06:23 +01:00
|
|
|
head=$(git rev-parse HEAD) &&
|
2008-02-05 08:04:18 +01:00
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
2014-03-10 19:49:32 +01:00
|
|
|
test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with failing hook (--no-verify)' '
|
|
|
|
|
2020-11-19 00:44:40 +01:00
|
|
|
test_when_finished "git checkout -f main" &&
|
2016-01-08 12:06:23 +01:00
|
|
|
head=$(git rev-parse HEAD) &&
|
2008-02-05 08:04:18 +01:00
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
2014-03-10 19:49:32 +01:00
|
|
|
test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
|
2008-02-05 08:04:18 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2013-01-02 19:42:50 +01:00
|
|
|
test_expect_success 'with failing hook (merge)' '
|
|
|
|
|
2020-11-19 00:44:40 +01:00
|
|
|
test_when_finished "git checkout -f main" &&
|
2013-01-02 19:42:50 +01:00
|
|
|
git checkout -B other HEAD@{1} &&
|
|
|
|
echo "more" >> file &&
|
|
|
|
git add file &&
|
|
|
|
rm -f "$HOOK" &&
|
|
|
|
git commit -m other &&
|
2014-03-10 19:49:31 +01:00
|
|
|
write_script "$HOOK" <<-EOF &&
|
2013-01-02 19:42:50 +01:00
|
|
|
exit 1
|
|
|
|
EOF
|
|
|
|
git checkout - &&
|
2014-03-18 11:00:55 +01:00
|
|
|
test_must_fail git merge --no-ff other
|
2013-01-02 19:42:50 +01:00
|
|
|
|
|
|
|
'
|
2008-02-05 08:04:18 +01:00
|
|
|
|
2021-02-11 02:53:51 +01:00
|
|
|
test_expect_success 'with failing hook (cherry-pick)' '
|
2020-11-19 00:44:40 +01:00
|
|
|
test_when_finished "git checkout -f main" &&
|
2018-01-24 13:34:21 +01:00
|
|
|
git checkout -B other b &&
|
|
|
|
test_must_fail git cherry-pick rebase-1 2>actual &&
|
|
|
|
test $(grep -c prepare-commit-msg actual) = 1
|
|
|
|
'
|
|
|
|
|
2008-02-05 08:04:18 +01:00
|
|
|
test_done
|