diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:49 -0700 |
| commit | 56ce87daffe58135abcaf235f2dec008f5f4cb4d (patch) | |
| tree | ed97fd5e9a93d0828067c6a8643de0bcfddd3b1e /t | |
| parent | Merge branch 'sg/t3903-missing-fix' (diff) | |
| parent | t3420-rebase-autostash: don't try to grep non-existing files (diff) | |
| download | tgif-56ce87daffe58135abcaf235f2dec008f5f4cb4d.tar.xz | |
Merge branch 'sg/t3420-autostash-fix'
Test fixes.
* sg/t3420-autostash-fix:
t3420-rebase-autostash: don't try to grep non-existing files
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index e243700660..0c4eefec76 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -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 && |