Skip to content

Commit eff960b

Browse files
mehul2029gitster
authored andcommitted
t5520: ensure consistent test conditions
Test title says that tests are done with rebase.autostash unset, but does not take any action to make sure that it is indeed unset. This may lead to test failure if future changes somehow pollutes the configuration globally. Ensure consistent test conditions by explicitly unsetting rebase.autostash. Signed-off-by: Mehul Jain <[email protected]> Reviewed-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent efa195d commit eff960b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

t/t5520-pull.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
279279
'
280280

281281
test_expect_success 'pull --rebase: --autostash & rebase.autostash unset' '
282+
test_unconfig rebase.autostash &&
282283
git reset --hard before-rebase &&
283284
echo dirty >new_file &&
284285
git add new_file &&
@@ -307,6 +308,7 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
307308
'
308309

309310
test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
311+
test_unconfig rebase.autostash &&
310312
git reset --hard before-rebase &&
311313
echo dirty >new_file &&
312314
git add new_file &&

0 commit comments

Comments
 (0)