[PATCH 2/5] t/t5520: explicitly unset rebase.autostash
- From
Mehul Jain <mehul.jain2029@gmail.com>
- Date
- Mar 29, 2016, 13:29 UTC
- Message-ID
- <1459258200-32444-3-git-send-email-mehul.jain2029@gmail.com>
- In-Reply-To
- <1459258200-32444-1-git-send-email-mehul.jain2029@gmail.com>
Tests title suggest that tests are done with rebase.autostash unset, but doesn not take any action to make sure that it is indeed unset.
Make sure that rebase.autostash is unset by explicitly setting it.
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