Re: How to handle patch series conflicts

2018-10-09 Thread Stephen Smith
On Monday, October 8, 2018 10:51:09 PM MST Junio C Hamano wrote: > The scripts themselves having the same name that is no more specific > tha just "commit" does not bother _me_ personally too much. If I > were doing it, unless you are an obsessive type that wants to see > spanking cleanness every

Re: How to handle patch series conflicts

2018-10-08 Thread Junio C Hamano
Stephen & Linda Smith writes: > Junio - I've been working this but would like your opinion on 7500, 7501 and > now 7510. > > I note that the the commit tests have intermixed functionality. An example > is > signoff tests that are in the three tests I mentioned. > > I've been tempted mul

Re: How to handle patch series conflicts

2018-10-07 Thread Stephen & Linda Smith
On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote: > Stephen & Linda Smith writes: > > Junio - > > > > On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: > >> > t7500-commit.sh > >> > t7501-commit.sh > >> > t7502-commit.sh > >> > t7509-commit.sh > >> > >> These

Re: How to handle patch series conflicts

2018-09-06 Thread Stephen Smith
On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote: > I think that one that is not even in 'pu' hasn't been looked at for > a long time; it is probably a good idea to discard and replace, if > you have something working. I submitted a working patch set yesterday. [1] https://pub

Re: How to handle patch series conflicts

2018-09-05 Thread Stephen & Linda Smith
On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote: > I think that one that is not even in 'pu' hasn't been looked at for > a long time; it is probably a good idea to discard and replace, if > you have something working. I submitted [1] over the weekend. I will add a spelling err

Re: How to handle patch series conflicts

2018-09-05 Thread Stephen & Linda Smith
On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote: > I think that one that is not even in 'pu' hasn't been looked at for > a long time; it is probably a good idea to discard and replace, if > you have something working. I submitted [1] over the weekend. I will add a spelling err

Re: How to handle patch series conflicts

2018-09-05 Thread Junio C Hamano
Stephen & Linda Smith writes: > Junio - > > On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: >> > t7500-commit.sh >> > t7501-commit.sh >> > t7502-commit.sh >> > t7509-commit.sh >> >> These seem to have organically grown and it is very likely that ones >> later introduced were

Re: How to handle patch series conflicts

2018-09-05 Thread Stefan Beller
On Wed, Sep 5, 2018 at 10:25 AM Stephen & Linda Smith wrote: > > Junio - > > On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: > > > t7500-commit.sh > > > t7501-commit.sh > > > t7502-commit.sh > > > t7509-commit.sh > > > > These seem to have organically grown and it is very likel

How to handle patch series conflicts

2018-09-05 Thread Stephen & Linda Smith
Junio - On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: > > t7500-commit.sh > > t7501-commit.sh > > t7502-commit.sh > > t7509-commit.sh > > These seem to have organically grown and it is very likely that ones > later introduced were added more from laziness. How does the proj