kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sg/t3420-autostash-fix' 

Test fixes.

* sg/t3420-autostash-fix:
  t3420-rebase-autostash: don't try to grep non-existing files
maint
Junio C Hamano 2018-08-27 14:33:49 -07:00
parent 5f0ed3e204 2745817028
commit 56ce87daff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t3420-rebase-autostash.sh
View File

@ -202,7 +202,7 @@ testrebase () {
echo dirty >>file3 && echo dirty >>file3 &&
test_must_fail git rebase$type related-onto-branch && test_must_fail git rebase$type related-onto-branch &&
test_path_is_file $dotest/autostash && test_path_is_file $dotest/autostash &&
! grep dirty file3 && test_path_is_missing file3 &&
rm -rf $dotest && rm -rf $dotest &&
git reset --hard && git reset --hard &&
git checkout feature-branch git checkout feature-branch
@ -216,7 +216,7 @@ testrebase () {
echo dirty >>file3 && echo dirty >>file3 &&
test_must_fail git rebase$type related-onto-branch && test_must_fail git rebase$type related-onto-branch &&
test_path_is_file $dotest/autostash && test_path_is_file $dotest/autostash &&
! grep dirty file3 && test_path_is_missing file3 &&
echo "conflicting-plus-goodbye" >file2 && echo "conflicting-plus-goodbye" >file2 &&
git add file2 && git add file2 &&
git rebase --continue && git rebase --continue &&
@ -233,7 +233,7 @@ testrebase () {
echo dirty >>file3 && echo dirty >>file3 &&
test_must_fail git rebase$type related-onto-branch && test_must_fail git rebase$type related-onto-branch &&
test_path_is_file $dotest/autostash && test_path_is_file $dotest/autostash &&
! grep dirty file3 && test_path_is_missing file3 &&
git rebase --skip && git rebase --skip &&
test_path_is_missing $dotest/autostash && test_path_is_missing $dotest/autostash &&
grep dirty file3 && grep dirty file3 &&
@ -248,7 +248,7 @@ testrebase () {
echo dirty >>file3 && echo dirty >>file3 &&
test_must_fail git rebase$type related-onto-branch && test_must_fail git rebase$type related-onto-branch &&
test_path_is_file $dotest/autostash && test_path_is_file $dotest/autostash &&
! grep dirty file3 && test_path_is_missing file3 &&
git rebase --abort && git rebase --abort &&
test_path_is_missing $dotest/autostash && test_path_is_missing $dotest/autostash &&
grep dirty file3 && grep dirty file3 &&