You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
214 lines
6.2 KiB
214 lines
6.2 KiB
#!/bin/sh |
|
|
|
test_description='Test cherry-pick continuation features |
|
|
|
+ anotherpick: rewrites foo to d |
|
+ picked: rewrites foo to c |
|
+ unrelatedpick: rewrites unrelated to reallyunrelated |
|
+ base: rewrites foo to b |
|
+ initial: writes foo as a, unrelated as unrelated |
|
|
|
' |
|
|
|
. ./test-lib.sh |
|
|
|
pristine_detach () { |
|
git cherry-pick --reset && |
|
git checkout -f "$1^0" && |
|
git read-tree -u --reset HEAD && |
|
git clean -d -f -f -q -x |
|
} |
|
|
|
test_expect_success setup ' |
|
echo unrelated >unrelated && |
|
git add unrelated && |
|
test_commit initial foo a && |
|
test_commit base foo b && |
|
test_commit unrelatedpick unrelated reallyunrelated && |
|
test_commit picked foo c && |
|
test_commit anotherpick foo d && |
|
git config advice.detachedhead false |
|
|
|
' |
|
|
|
test_expect_success 'cherry-pick persists data on failure' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick -s base..anotherpick && |
|
test_path_is_dir .git/sequencer && |
|
test_path_is_file .git/sequencer/head && |
|
test_path_is_file .git/sequencer/todo && |
|
test_path_is_file .git/sequencer/opts |
|
' |
|
|
|
test_expect_success 'cherry-pick persists opts correctly' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours base..anotherpick && |
|
test_path_is_dir .git/sequencer && |
|
test_path_is_file .git/sequencer/head && |
|
test_path_is_file .git/sequencer/todo && |
|
test_path_is_file .git/sequencer/opts && |
|
echo "true" >expect && |
|
git config --file=.git/sequencer/opts --get-all options.signoff >actual && |
|
test_cmp expect actual && |
|
echo "1" >expect && |
|
git config --file=.git/sequencer/opts --get-all options.mainline >actual && |
|
test_cmp expect actual && |
|
echo "recursive" >expect && |
|
git config --file=.git/sequencer/opts --get-all options.strategy >actual && |
|
test_cmp expect actual && |
|
cat >expect <<-\EOF && |
|
patience |
|
ours |
|
EOF |
|
git config --file=.git/sequencer/opts --get-all options.strategy-option >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'cherry-pick cleans up sequencer state upon success' ' |
|
pristine_detach initial && |
|
git cherry-pick initial..picked && |
|
test_path_is_missing .git/sequencer |
|
' |
|
|
|
test_expect_success '--reset does not complain when no cherry-pick is in progress' ' |
|
pristine_detach initial && |
|
git cherry-pick --reset |
|
' |
|
|
|
test_expect_success '--reset cleans up sequencer state' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick base..picked && |
|
git cherry-pick --reset && |
|
test_path_is_missing .git/sequencer |
|
' |
|
|
|
test_expect_success 'cherry-pick cleans up sequencer state when one commit is left' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick base..picked && |
|
test_path_is_missing .git/sequencer && |
|
echo "resolved" >foo && |
|
git add foo && |
|
git commit && |
|
{ |
|
git rev-list HEAD | |
|
git diff-tree --root --stdin | |
|
sed "s/$_x40/OBJID/g" |
|
} >actual && |
|
cat >expect <<-\EOF && |
|
OBJID |
|
:100644 100644 OBJID OBJID M foo |
|
OBJID |
|
:100644 100644 OBJID OBJID M unrelated |
|
OBJID |
|
:000000 100644 OBJID OBJID A foo |
|
:000000 100644 OBJID OBJID A unrelated |
|
EOF |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'cherry-pick does not implicitly stomp an existing operation' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick base..anotherpick && |
|
test-chmtime -v +0 .git/sequencer >expect && |
|
test_must_fail git cherry-pick unrelatedpick && |
|
test-chmtime -v +0 .git/sequencer >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success '--continue complains when no cherry-pick is in progress' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick --continue |
|
' |
|
|
|
test_expect_success '--continue complains when there are unresolved conflicts' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick base..anotherpick && |
|
test_must_fail git cherry-pick --continue |
|
' |
|
|
|
test_expect_success '--continue continues after conflicts are resolved' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick base..anotherpick && |
|
echo "c" >foo && |
|
git add foo && |
|
git commit && |
|
git cherry-pick --continue && |
|
test_path_is_missing .git/sequencer && |
|
{ |
|
git rev-list HEAD | |
|
git diff-tree --root --stdin | |
|
sed "s/$_x40/OBJID/g" |
|
} >actual && |
|
cat >expect <<-\EOF && |
|
OBJID |
|
:100644 100644 OBJID OBJID M foo |
|
OBJID |
|
:100644 100644 OBJID OBJID M foo |
|
OBJID |
|
:100644 100644 OBJID OBJID M unrelated |
|
OBJID |
|
:000000 100644 OBJID OBJID A foo |
|
:000000 100644 OBJID OBJID A unrelated |
|
EOF |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success '--continue respects opts' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick -x base..anotherpick && |
|
echo "c" >foo && |
|
git add foo && |
|
git commit && |
|
git cherry-pick --continue && |
|
test_path_is_missing .git/sequencer && |
|
git cat-file commit HEAD >anotherpick_msg && |
|
git cat-file commit HEAD~1 >picked_msg && |
|
git cat-file commit HEAD~2 >unrelatedpick_msg && |
|
git cat-file commit HEAD~3 >initial_msg && |
|
test_must_fail grep "cherry picked from" initial_msg && |
|
grep "cherry picked from" unrelatedpick_msg && |
|
grep "cherry picked from" picked_msg && |
|
grep "cherry picked from" anotherpick_msg |
|
' |
|
|
|
test_expect_success '--signoff is not automatically propagated to resolved conflict' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick --signoff base..anotherpick && |
|
echo "c" >foo && |
|
git add foo && |
|
git commit && |
|
git cherry-pick --continue && |
|
test_path_is_missing .git/sequencer && |
|
git cat-file commit HEAD >anotherpick_msg && |
|
git cat-file commit HEAD~1 >picked_msg && |
|
git cat-file commit HEAD~2 >unrelatedpick_msg && |
|
git cat-file commit HEAD~3 >initial_msg && |
|
test_must_fail grep "Signed-off-by:" initial_msg && |
|
grep "Signed-off-by:" unrelatedpick_msg && |
|
test_must_fail grep "Signed-off-by:" picked_msg && |
|
grep "Signed-off-by:" anotherpick_msg |
|
' |
|
|
|
test_expect_success 'malformed instruction sheet 1' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick base..anotherpick && |
|
echo "resolved" >foo && |
|
git add foo && |
|
git commit && |
|
sed "s/pick /pick/" .git/sequencer/todo >new_sheet && |
|
cp new_sheet .git/sequencer/todo && |
|
test_must_fail git cherry-pick --continue |
|
' |
|
|
|
test_expect_success 'malformed instruction sheet 2' ' |
|
pristine_detach initial && |
|
test_must_fail git cherry-pick base..anotherpick && |
|
echo "resolved" >foo && |
|
git add foo && |
|
git commit && |
|
sed "s/pick/revert/" .git/sequencer/todo >new_sheet && |
|
cp new_sheet .git/sequencer/todo && |
|
test_must_fail git cherry-pick --continue |
|
' |
|
|
|
test_done
|
|
|