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 <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mehul Jain committed
Apr 2, 2016 at 23:28 UTC
eff960b3afc70cb936dbf133e8c60d397d8069ac
1 file changed
+2
t/t5520-pull.sh
+2
@@ -279,6 +279,7 @@ test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
279
'
280
281
test_expect_success 'pull --rebase: --autostash & rebase.autostash unset' '
282
+ test_unconfig rebase.autostash &&
283
git reset --hard before-rebase &&
284
echo dirty >new_file &&
285
git add new_file &&
@@ -307,6 +308,7 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
308
'
309
310
test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
311
+ test_unconfig rebase.autostash &&
312
git reset --hard before-rebase &&
313
echo dirty >new_file &&
314
git add new_file &&