development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-06 00:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase: add regression tests for console output

Browse source 
Check the console output when using --autostash and the stash applies
cleanly is what we expect. The test is quite strict but should catch
any changes to the console output from the various rebase flavors.

Thanks-to: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2017-06-19 18:56:04 +01:00 committed by Junio C Hamano
parent 1ceb9dfab7
commit b76aeae553
1 changed files with 64 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
t/t3420-rebase-autostash.sh
View file

@ -33,7 +33,62 @@ test_expect_success setup '
git commit -m "related commit"
'
testrebase() {
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
}
testrebase () {
type=$1
dotest=$2
@ -51,14 +106,20 @@ testrebase() {
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 rebase$type unrelated-onto-branch &&
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_cmp expected actual
'
test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
test_config rebase.autostash true &&
git reset --hard &&