mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
883cb1b8f8
Instead of generating a silly-looking `Revert "Revert "foo""`, make it a more humane `Reapply "foo"`. This is done for two reasons: - To cover the actually common case of just a double revert. - To encourage people to rewrite summaries of recursive reverts by setting an example (a subsequent commit will also do this explicitly in the documentation). To achieve these goals, the mechanism does not need to be particularly sophisticated. Therefore, more complicated alternatives which would "compress more efficiently" have not been implemented. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
237 lines
6.2 KiB
Bash
Executable file
237 lines
6.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='miscellaneous basic tests for cherry-pick and revert'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
for l in a b c d e f g h i j k l m n o
|
|
do
|
|
echo $l$l$l$l$l$l$l$l$l || return 1
|
|
done >oops &&
|
|
|
|
test_tick &&
|
|
git add oops &&
|
|
git commit -m initial &&
|
|
git tag initial &&
|
|
|
|
test_tick &&
|
|
echo "Add extra line at the end" >>oops &&
|
|
git commit -a -m added &&
|
|
git tag added &&
|
|
|
|
test_tick &&
|
|
git mv oops spoo &&
|
|
git commit -m rename1 &&
|
|
git tag rename1 &&
|
|
|
|
test_tick &&
|
|
git checkout -b side initial &&
|
|
git mv oops opos &&
|
|
git commit -m rename2 &&
|
|
git tag rename2
|
|
'
|
|
|
|
test_expect_success 'cherry-pick --nonsense' '
|
|
|
|
pos=$(git rev-parse HEAD) &&
|
|
git diff --exit-code HEAD &&
|
|
test_must_fail git cherry-pick --nonsense 2>msg &&
|
|
git diff --exit-code HEAD "$pos" &&
|
|
test_i18ngrep "[Uu]sage:" msg
|
|
'
|
|
|
|
test_expect_success 'revert --nonsense' '
|
|
|
|
pos=$(git rev-parse HEAD) &&
|
|
git diff --exit-code HEAD &&
|
|
test_must_fail git revert --nonsense 2>msg &&
|
|
git diff --exit-code HEAD "$pos" &&
|
|
test_i18ngrep "[Uu]sage:" msg
|
|
'
|
|
|
|
# the following two test cherry-pick and revert with renames
|
|
#
|
|
# --
|
|
# + rename2: renames oops to opos
|
|
# + rename1: renames oops to spoo
|
|
# + added: adds extra line to oops
|
|
# ++ initial: has lines in oops
|
|
|
|
test_expect_success 'cherry-pick after renaming branch' '
|
|
|
|
git checkout rename2 &&
|
|
git cherry-pick added &&
|
|
test_cmp_rev rename2 HEAD^ &&
|
|
grep "Add extra line at the end" opos &&
|
|
git reflog -1 | grep cherry-pick
|
|
|
|
'
|
|
|
|
test_expect_success 'revert after renaming branch' '
|
|
|
|
git checkout rename1 &&
|
|
git revert added &&
|
|
test_cmp_rev rename1 HEAD^ &&
|
|
test_path_is_file spoo &&
|
|
test_cmp_rev initial:oops HEAD:spoo &&
|
|
git reflog -1 | grep revert
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry-pick on stat-dirty working tree' '
|
|
git clone . copy &&
|
|
(
|
|
cd copy &&
|
|
git checkout initial &&
|
|
test-tool chmtime +40 oops &&
|
|
git cherry-pick added
|
|
)
|
|
'
|
|
|
|
test_expect_success 'revert forbidden on dirty working tree' '
|
|
|
|
echo content >extra_file &&
|
|
git add extra_file &&
|
|
test_must_fail git revert HEAD 2>errors &&
|
|
test_i18ngrep "your local changes would be overwritten by " errors
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry-pick on unborn branch' '
|
|
git checkout --orphan unborn &&
|
|
git rm --cached -r . &&
|
|
rm -rf * &&
|
|
git cherry-pick initial &&
|
|
git diff --quiet initial &&
|
|
test_cmp_rev ! initial HEAD
|
|
'
|
|
|
|
test_expect_success 'cherry-pick "-" to pick from previous branch' '
|
|
git checkout unborn &&
|
|
test_commit to-pick actual content &&
|
|
git checkout main &&
|
|
git cherry-pick - &&
|
|
echo content >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cherry-pick "-" is meaningless without checkout' '
|
|
test_create_repo afresh &&
|
|
(
|
|
cd afresh &&
|
|
test_commit one &&
|
|
test_commit two &&
|
|
test_commit three &&
|
|
test_must_fail git cherry-pick -
|
|
)
|
|
'
|
|
|
|
test_expect_success 'cherry-pick "-" works with arguments' '
|
|
git checkout -b side-branch &&
|
|
test_commit change actual change &&
|
|
git checkout main &&
|
|
git cherry-pick -s - &&
|
|
echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
|
|
git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
|
|
test_cmp expect signoff &&
|
|
echo change >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cherry-pick works with dirty renamed file' '
|
|
test_commit to-rename &&
|
|
git checkout -b unrelated &&
|
|
test_commit unrelated &&
|
|
git checkout @{-1} &&
|
|
git mv to-rename.t renamed &&
|
|
test_tick &&
|
|
git commit -m renamed &&
|
|
echo modified >renamed &&
|
|
git cherry-pick refs/heads/unrelated &&
|
|
test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
|
|
grep -q "^modified$" renamed
|
|
'
|
|
|
|
test_expect_success 'advice from failed revert' '
|
|
test_when_finished "git reset --hard" &&
|
|
test_commit --no-tag "add dream" dream dream &&
|
|
dream_oid=$(git rev-parse --short HEAD) &&
|
|
cat <<-EOF >expected &&
|
|
error: could not revert $dream_oid... add dream
|
|
hint: After resolving the conflicts, mark them with
|
|
hint: "git add/rm <pathspec>", then run
|
|
hint: "git revert --continue".
|
|
hint: You can instead skip this commit with "git revert --skip".
|
|
hint: To abort and get back to the state before "git revert",
|
|
hint: run "git revert --abort".
|
|
EOF
|
|
test_commit --append --no-tag "double-add dream" dream dream &&
|
|
test_must_fail git revert HEAD^ 2>actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_subject () {
|
|
echo "$1" >expect &&
|
|
git log -1 --pretty=%s >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success 'titles of fresh reverts' '
|
|
test_commit --no-tag A file1 &&
|
|
test_commit --no-tag B file1 &&
|
|
git revert --no-edit HEAD &&
|
|
test_expect_subject "Revert \"B\"" &&
|
|
git revert --no-edit HEAD &&
|
|
test_expect_subject "Reapply \"B\"" &&
|
|
git revert --no-edit HEAD &&
|
|
test_expect_subject "Revert \"Reapply \"B\"\""
|
|
'
|
|
|
|
test_expect_success 'title of legacy double revert' '
|
|
test_commit --no-tag "Revert \"Revert \"B\"\"" file1 &&
|
|
git revert --no-edit HEAD &&
|
|
test_expect_subject "Revert \"Revert \"Revert \"B\"\"\""
|
|
'
|
|
|
|
test_expect_success 'identification of reverted commit (default)' '
|
|
test_commit to-ident &&
|
|
test_when_finished "git reset --hard to-ident" &&
|
|
git checkout --detach to-ident &&
|
|
git revert --no-edit HEAD &&
|
|
git cat-file commit HEAD >actual.raw &&
|
|
grep "^This reverts " actual.raw >actual &&
|
|
echo "This reverts commit $(git rev-parse HEAD^)." >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'identification of reverted commit (--reference)' '
|
|
git checkout --detach to-ident &&
|
|
git revert --reference --no-edit HEAD &&
|
|
git cat-file commit HEAD >actual.raw &&
|
|
grep "^This reverts " actual.raw >actual &&
|
|
echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'identification of reverted commit (revert.reference)' '
|
|
git checkout --detach to-ident &&
|
|
git -c revert.reference=true revert --no-edit HEAD &&
|
|
git cat-file commit HEAD >actual.raw &&
|
|
grep "^This reverts " actual.raw >actual &&
|
|
echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cherry-pick is unaware of --reference (for now)' '
|
|
test_when_finished "git reset --hard" &&
|
|
test_must_fail git cherry-pick --reference HEAD 2>actual &&
|
|
grep "^usage: git cherry-pick" actual
|
|
'
|
|
|
|
test_done
|