diff options
| author | Mehul Jain <mehul.jain2029@gmail.com> | 2016-04-02 20:58:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-04 21:07:33 +0300 |
| commit | eff960b3afc70cb936dbf133e8c60d397d8069ac (patch) | |
| tree | 1bf5ad6f9643498a497bd03722e63b5aa0e3d4fd /t/t5520-pull.sh | |
| parent | efa195d5b3ab69b419d16b1882e8e1c0537186f5 (diff) | |
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>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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 && |