From: Mehul Jain Date: Sat, 2 Apr 2016 17:58:27 +0000 (+0530) Subject: t5520: ensure consistent test conditions X-Git-Tag: v2.9.0-rc0~123^2~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eff960b3afc70cb936dbf133e8c60d397d8069ac?hp=efa195d5b3ab69b419d16b1882e8e1c0537186f5 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 Reviewed-by: Eric Sunshine Signed-off-by: Junio C Hamano --- diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 5be39df50a..9ee22185f3 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -279,6 +279,7 @@ test_expect_success 'pull --rebase --autostash & rebase.autostash=false' ' ' test_expect_success 'pull --rebase: --autostash & rebase.autostash unset' ' + test_unconfig rebase.autostash && git reset --hard before-rebase && echo dirty >new_file && git add new_file && @@ -307,6 +308,7 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' ' ' test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' ' + test_unconfig rebase.autostash && git reset --hard before-rebase && echo dirty >new_file && git add new_file &&