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.
354 lines
11 KiB
354 lines
11 KiB
#!/bin/sh |
|
# |
|
# Copyright (c) 2013 Ramkumar Ramachandra |
|
# |
|
|
|
test_description='git rebase --autostash tests' |
|
. ./test-lib.sh |
|
|
|
test_expect_success setup ' |
|
echo hello-world >file0 && |
|
git add . && |
|
test_tick && |
|
git commit -m "initial commit" && |
|
git checkout -b feature-branch && |
|
echo another-hello >file1 && |
|
echo goodbye >file2 && |
|
git add . && |
|
test_tick && |
|
git commit -m "second commit" && |
|
echo final-goodbye >file3 && |
|
git add . && |
|
test_tick && |
|
git commit -m "third commit" && |
|
git checkout -b unrelated-onto-branch master && |
|
echo unrelated >file4 && |
|
git add . && |
|
test_tick && |
|
git commit -m "unrelated commit" && |
|
git checkout -b related-onto-branch master && |
|
echo conflicting-change >file2 && |
|
git add . && |
|
test_tick && |
|
git commit -m "related commit" |
|
' |
|
|
|
create_expected_success_am () { |
|
cat >expected <<-EOF |
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) |
|
HEAD is now at $(git rev-parse --short feature-branch) third commit |
|
First, rewinding head to replay your work on top of it... |
|
Applying: second commit |
|
Applying: third commit |
|
Applied autostash. |
|
EOF |
|
} |
|
|
|
create_expected_success_interactive () { |
|
q_to_cr >expected <<-EOF |
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) |
|
HEAD is now at $(git rev-parse --short feature-branch) third commit |
|
Rebasing (1/2)QRebasing (2/2)QApplied autostash. |
|
Successfully rebased and updated refs/heads/rebased-feature-branch. |
|
EOF |
|
} |
|
|
|
create_expected_success_merge () { |
|
cat >expected <<-EOF |
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) |
|
HEAD is now at $(git rev-parse --short feature-branch) third commit |
|
First, rewinding head to replay your work on top of it... |
|
Merging unrelated-onto-branch with HEAD~1 |
|
Merging: |
|
$(git rev-parse --short unrelated-onto-branch) unrelated commit |
|
$(git rev-parse --short feature-branch^) second commit |
|
found 1 common ancestor: |
|
$(git rev-parse --short feature-branch~2) initial commit |
|
[detached HEAD $(git rev-parse --short rebased-feature-branch~1)] second commit |
|
Author: A U Thor <author@example.com> |
|
Date: Thu Apr 7 15:14:13 2005 -0700 |
|
2 files changed, 2 insertions(+) |
|
create mode 100644 file1 |
|
create mode 100644 file2 |
|
Committed: 0001 second commit |
|
Merging unrelated-onto-branch with HEAD~0 |
|
Merging: |
|
$(git rev-parse --short rebased-feature-branch~1) second commit |
|
$(git rev-parse --short feature-branch) third commit |
|
found 1 common ancestor: |
|
$(git rev-parse --short feature-branch~1) second commit |
|
[detached HEAD $(git rev-parse --short rebased-feature-branch)] third commit |
|
Author: A U Thor <author@example.com> |
|
Date: Thu Apr 7 15:15:13 2005 -0700 |
|
1 file changed, 1 insertion(+) |
|
create mode 100644 file3 |
|
Committed: 0002 third commit |
|
All done. |
|
Applied autostash. |
|
EOF |
|
} |
|
|
|
create_expected_failure_am () { |
|
cat >expected <<-EOF |
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) |
|
HEAD is now at $(git rev-parse --short feature-branch) third commit |
|
First, rewinding head to replay your work on top of it... |
|
Applying: second commit |
|
Applying: third commit |
|
Applying autostash resulted in conflicts. |
|
Your changes are safe in the stash. |
|
You can run "git stash pop" or "git stash drop" at any time. |
|
EOF |
|
} |
|
|
|
create_expected_failure_interactive () { |
|
q_to_cr >expected <<-EOF |
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) |
|
HEAD is now at $(git rev-parse --short feature-branch) third commit |
|
Rebasing (1/2)QRebasing (2/2)QApplying autostash resulted in conflicts. |
|
Your changes are safe in the stash. |
|
You can run "git stash pop" or "git stash drop" at any time. |
|
Successfully rebased and updated refs/heads/rebased-feature-branch. |
|
EOF |
|
} |
|
|
|
create_expected_failure_merge () { |
|
cat >expected <<-EOF |
|
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) |
|
HEAD is now at $(git rev-parse --short feature-branch) third commit |
|
First, rewinding head to replay your work on top of it... |
|
Merging unrelated-onto-branch with HEAD~1 |
|
Merging: |
|
$(git rev-parse --short unrelated-onto-branch) unrelated commit |
|
$(git rev-parse --short feature-branch^) second commit |
|
found 1 common ancestor: |
|
$(git rev-parse --short feature-branch~2) initial commit |
|
[detached HEAD $(git rev-parse --short rebased-feature-branch~1)] second commit |
|
Author: A U Thor <author@example.com> |
|
Date: Thu Apr 7 15:14:13 2005 -0700 |
|
2 files changed, 2 insertions(+) |
|
create mode 100644 file1 |
|
create mode 100644 file2 |
|
Committed: 0001 second commit |
|
Merging unrelated-onto-branch with HEAD~0 |
|
Merging: |
|
$(git rev-parse --short rebased-feature-branch~1) second commit |
|
$(git rev-parse --short feature-branch) third commit |
|
found 1 common ancestor: |
|
$(git rev-parse --short feature-branch~1) second commit |
|
[detached HEAD $(git rev-parse --short rebased-feature-branch)] third commit |
|
Author: A U Thor <author@example.com> |
|
Date: Thu Apr 7 15:15:13 2005 -0700 |
|
1 file changed, 1 insertion(+) |
|
create mode 100644 file3 |
|
Committed: 0002 third commit |
|
All done. |
|
Applying autostash resulted in conflicts. |
|
Your changes are safe in the stash. |
|
You can run "git stash pop" or "git stash drop" at any time. |
|
EOF |
|
} |
|
|
|
testrebase () { |
|
type=$1 |
|
dotest=$2 |
|
|
|
test_expect_success "rebase$type: dirty worktree, --no-autostash" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b rebased-feature-branch feature-branch && |
|
test_when_finished git branch -D rebased-feature-branch && |
|
test_when_finished git checkout feature-branch && |
|
echo dirty >>file3 && |
|
test_must_fail git rebase$type --no-autostash unrelated-onto-branch |
|
' |
|
|
|
test_expect_success "rebase$type: dirty worktree, non-conflicting rebase" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b rebased-feature-branch feature-branch && |
|
echo dirty >>file3 && |
|
git rebase$type unrelated-onto-branch >actual 2>&1 && |
|
grep unrelated file4 && |
|
grep dirty file3 && |
|
git checkout feature-branch |
|
' |
|
|
|
test_expect_success "rebase$type --autostash: check output" ' |
|
test_when_finished git branch -D rebased-feature-branch && |
|
suffix=${type#\ --} && suffix=${suffix:-am} && |
|
create_expected_success_$suffix && |
|
test_i18ncmp expected actual |
|
' |
|
|
|
test_expect_success "rebase$type: dirty index, non-conflicting rebase" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b rebased-feature-branch feature-branch && |
|
test_when_finished git branch -D rebased-feature-branch && |
|
echo dirty >>file3 && |
|
git add file3 && |
|
git rebase$type unrelated-onto-branch && |
|
grep unrelated file4 && |
|
grep dirty file3 && |
|
git checkout feature-branch |
|
' |
|
|
|
test_expect_success "rebase$type: conflicting rebase" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b rebased-feature-branch feature-branch && |
|
test_when_finished git branch -D rebased-feature-branch && |
|
echo dirty >>file3 && |
|
test_must_fail git rebase$type related-onto-branch && |
|
test_path_is_file $dotest/autostash && |
|
! grep dirty file3 && |
|
rm -rf $dotest && |
|
git reset --hard && |
|
git checkout feature-branch |
|
' |
|
|
|
test_expect_success "rebase$type: --continue" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b rebased-feature-branch feature-branch && |
|
test_when_finished git branch -D rebased-feature-branch && |
|
echo dirty >>file3 && |
|
test_must_fail git rebase$type related-onto-branch && |
|
test_path_is_file $dotest/autostash && |
|
! grep dirty file3 && |
|
echo "conflicting-plus-goodbye" >file2 && |
|
git add file2 && |
|
git rebase --continue && |
|
test_path_is_missing $dotest/autostash && |
|
grep dirty file3 && |
|
git checkout feature-branch |
|
' |
|
|
|
test_expect_success "rebase$type: --skip" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b rebased-feature-branch feature-branch && |
|
test_when_finished git branch -D rebased-feature-branch && |
|
echo dirty >>file3 && |
|
test_must_fail git rebase$type related-onto-branch && |
|
test_path_is_file $dotest/autostash && |
|
! grep dirty file3 && |
|
git rebase --skip && |
|
test_path_is_missing $dotest/autostash && |
|
grep dirty file3 && |
|
git checkout feature-branch |
|
' |
|
|
|
test_expect_success "rebase$type: --abort" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b rebased-feature-branch feature-branch && |
|
test_when_finished git branch -D rebased-feature-branch && |
|
echo dirty >>file3 && |
|
test_must_fail git rebase$type related-onto-branch && |
|
test_path_is_file $dotest/autostash && |
|
! grep dirty file3 && |
|
git rebase --abort && |
|
test_path_is_missing $dotest/autostash && |
|
grep dirty file3 && |
|
git checkout feature-branch |
|
' |
|
|
|
test_expect_success "rebase$type: non-conflicting rebase, conflicting stash" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b rebased-feature-branch feature-branch && |
|
echo dirty >file4 && |
|
git add file4 && |
|
git rebase$type unrelated-onto-branch >actual 2>&1 && |
|
test_path_is_missing $dotest && |
|
git reset --hard && |
|
grep unrelated file4 && |
|
! grep dirty file4 && |
|
git checkout feature-branch && |
|
git stash pop && |
|
grep dirty file4 |
|
' |
|
|
|
test_expect_success "rebase$type: check output with conflicting stash" ' |
|
test_when_finished git branch -D rebased-feature-branch && |
|
suffix=${type#\ --} && suffix=${suffix:-am} && |
|
create_expected_failure_$suffix && |
|
test_i18ncmp expected actual |
|
' |
|
} |
|
|
|
test_expect_success "rebase: fast-forward rebase" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b behind-feature-branch feature-branch~1 && |
|
test_when_finished git branch -D behind-feature-branch && |
|
echo dirty >>file1 && |
|
git rebase feature-branch && |
|
grep dirty file1 && |
|
git checkout feature-branch |
|
' |
|
|
|
test_expect_success "rebase: noop rebase" ' |
|
test_config rebase.autostash true && |
|
git reset --hard && |
|
git checkout -b same-feature-branch feature-branch && |
|
test_when_finished git branch -D same-feature-branch && |
|
echo dirty >>file1 && |
|
git rebase feature-branch && |
|
grep dirty file1 && |
|
git checkout feature-branch |
|
' |
|
|
|
testrebase "" .git/rebase-apply |
|
testrebase " --merge" .git/rebase-merge |
|
testrebase " --interactive" .git/rebase-merge |
|
|
|
test_expect_success 'abort rebase -i with --autostash' ' |
|
test_when_finished "git reset --hard" && |
|
echo uncommitted-content >file0 && |
|
( |
|
write_script abort-editor.sh <<-\EOF && |
|
echo >"$1" |
|
EOF |
|
test_set_editor "$(pwd)/abort-editor.sh" && |
|
test_must_fail git rebase -i --autostash HEAD^ && |
|
rm -f abort-editor.sh |
|
) && |
|
echo uncommitted-content >expected && |
|
test_cmp expected file0 |
|
' |
|
|
|
test_expect_success 'restore autostash on editor failure' ' |
|
test_when_finished "git reset --hard" && |
|
echo uncommitted-content >file0 && |
|
( |
|
test_set_editor "false" && |
|
test_must_fail git rebase -i --autostash HEAD^ |
|
) && |
|
echo uncommitted-content >expected && |
|
test_cmp expected file0 |
|
' |
|
|
|
test_expect_success 'autostash is saved on editor failure with conflict' ' |
|
test_when_finished "git reset --hard" && |
|
echo uncommitted-content >file0 && |
|
( |
|
write_script abort-editor.sh <<-\EOF && |
|
echo conflicting-content >file0 |
|
exit 1 |
|
EOF |
|
test_set_editor "$(pwd)/abort-editor.sh" && |
|
test_must_fail git rebase -i --autostash HEAD^ && |
|
rm -f abort-editor.sh |
|
) && |
|
echo conflicting-content >expected && |
|
test_cmp expected file0 && |
|
git checkout file0 && |
|
git stash pop && |
|
echo uncommitted-content >expected && |
|
test_cmp expected file0 |
|
' |
|
|
|
test_done
|
|
|