[PATCH 0/5] modify tests for --[no-]autostash option
- From
Mehul Jain <mehul.jain2029@gmail.com>
- Date
- Mar 29, 2016, 13:29 UTC
- Message-ID
- <1459258200-32444-1-git-send-email-mehul.jain2029@gmail.com>
The following patch series is applicable on mj/pull-rebase-autostash.
This series contain changes suggested by Eric and Matthieu on following series
http://thread.gmane.org/gmane.comp.version-control.git/289434
Changes made:
* [Patch 4/5] reduces the code needed to test possible
combinations of --autostash and rebase.autostash by introducing
two functions. Also introduce a loop to tackle the repetitive code used to
test the usage of --[no-]autostash without --rebase. * [Patch 5/5] introduces two new tests to check the cases when
"git pull --[no-]autostash" is called with pull.rebase=true.Mehul Jain (5): t/t5520: change rebase.autoStash to rebase.autostash t/t5520: explicitly unset rebase.autostash t/t5520: use test_i18ngrep instead of test_cmp t/t5520: modify tests to reduce common code t/t5520: test --[no-]autostash with pull.rebase=true
t/t5520-pull.sh | 120 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 59 deletions(-)
-- 2.7.1.340.g69eb491.dirty