Re: [PATCH v2 0/7] t5520: tests for --[no-]autostash option

2016-04-04 Thread Mehul Jain
On Mon, Apr 4, 2016 at 10:30 PM, Junio C Hamano wrote: > Matthieu Moy writes: > >> Mehul Jain writes: >> >>> -test_rebase_autostash () { >>> +test_pull_autostash () { >>> git reset --hard before-rebase && >>> echo dirty >new_file && >>> git add new_file && >>> -git pull --reba

Re: [PATCH v2 0/7] t5520: tests for --[no-]autostash option

2016-04-04 Thread Junio C Hamano
Matthieu Moy writes: > Mehul Jain writes: > >> -test_rebase_autostash () { >> +test_pull_autostash () { >> git reset --hard before-rebase && >> echo dirty >new_file && >> git add new_file && >> -git pull --rebase --autostash . copy && >> +git pull $@ . copy && > > Not stri

Re: [PATCH v2 0/7] t5520: tests for --[no-]autostash option

2016-04-04 Thread Mehul Jain
On Mon, Apr 4, 2016 at 1:01 PM, Matthieu Moy wrote: > Mehul Jain writes: > >> -test_rebase_autostash () { >> +test_pull_autostash () { >> git reset --hard before-rebase && >> echo dirty >new_file && >> git add new_file && >> - git pull --rebase --autostash . copy && >> +

Re: [PATCH v2 0/7] t5520: tests for --[no-]autostash option

2016-04-04 Thread Matthieu Moy
Mehul Jain writes: > -test_rebase_autostash () { > +test_pull_autostash () { > git reset --hard before-rebase && > echo dirty >new_file && > git add new_file && > - git pull --rebase --autostash . copy && > + git pull $@ . copy && Not strictly needed here, but I'd write

Re: [PATCH v2 0/7] t5520: tests for --[no-]autostash option

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain wrote: > The following series is applicable on mj/pull-rebase-autostash. > > Changes made vs v1: > * [Patch v1 4/5] is broken into three patches to increase > readability of the patches. > > * [Patch 4/5] Factor o

[PATCH v2 0/7] t5520: tests for --[no-]autostash option

2016-04-02 Thread Mehul Jain
The following series is applicable on mj/pull-rebase-autostash. Thanks Eric and Junio for there comments on previous version[1] Changes made vs v1: * [Patch v1 4/5] is broken into three patches to increase readability of the patches. * [Patch 4/5] Factor