mirror of
https://github.com/git/git
synced 2024-08-26 11:09:18 +00:00
t3420-rebase-autostash: don't try to grep non-existing files
Several tests in 't3420-rebase-autostash.sh' start various rebase processes that are expected to fail because of merge conflicts. These tests then run '! grep' to ensure that the autostash feature did its job, and the dirty contents of a file is gone. However, due to the test repo's history and the choice of upstream branch that file shouldn't exist in the conflicted state at all. Consequently, this 'grep' doesn't fail as expected, because it can't find the dirty content, but it fails because it can't open the file. Tighten this check by using 'test_path_is_missing' instead, thereby avoiding unexpected errors from 'grep' as well. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
53f9a3e157
commit
2745817028
|
@ -202,7 +202,7 @@ testrebase () {
|
|||
echo dirty >>file3 &&
|
||||
test_must_fail git rebase$type related-onto-branch &&
|
||||
test_path_is_file $dotest/autostash &&
|
||||
! grep dirty file3 &&
|
||||
test_path_is_missing file3 &&
|
||||
rm -rf $dotest &&
|
||||
git reset --hard &&
|
||||
git checkout feature-branch
|
||||
|
@ -216,7 +216,7 @@ testrebase () {
|
|||
echo dirty >>file3 &&
|
||||
test_must_fail git rebase$type related-onto-branch &&
|
||||
test_path_is_file $dotest/autostash &&
|
||||
! grep dirty file3 &&
|
||||
test_path_is_missing file3 &&
|
||||
echo "conflicting-plus-goodbye" >file2 &&
|
||||
git add file2 &&
|
||||
git rebase --continue &&
|
||||
|
@ -233,7 +233,7 @@ testrebase () {
|
|||
echo dirty >>file3 &&
|
||||
test_must_fail git rebase$type related-onto-branch &&
|
||||
test_path_is_file $dotest/autostash &&
|
||||
! grep dirty file3 &&
|
||||
test_path_is_missing file3 &&
|
||||
git rebase --skip &&
|
||||
test_path_is_missing $dotest/autostash &&
|
||||
grep dirty file3 &&
|
||||
|
@ -248,7 +248,7 @@ testrebase () {
|
|||
echo dirty >>file3 &&
|
||||
test_must_fail git rebase$type related-onto-branch &&
|
||||
test_path_is_file $dotest/autostash &&
|
||||
! grep dirty file3 &&
|
||||
test_path_is_missing file3 &&
|
||||
git rebase --abort &&
|
||||
test_path_is_missing $dotest/autostash &&
|
||||
grep dirty file3 &&
|
||||
|
|
Loading…
Reference in a new issue