[PATCH v2 2/7] t5520: ensure consistent test conditions
- From
Mehul Jain <mehul.jain2029@gmail.com>
- Date
- Apr 2, 2016, 17:58 UTC
- Message-ID
- <1459619912-5445-3-git-send-email-mehul.jain2029@gmail.com>
- In-Reply-To
- <1459619912-5445-1-git-send-email-mehul.jain2029@gmail.com>
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> --- t/t5520-pull.sh | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 5be39df..9ee2218 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 &&
-- 2.7.1.340.g69eb491.dirty