Re: [RFC PATCH v2 1/1] rebase-interactive: Add git_rebase__interactive__preserve_merges

2018-03-21 Thread Junio C Hamano
Wink Saville writes: >> Good code simplification that turns >> >> if A >> if B >> do this thing >> fi >> fi >> >> into >> >> if A & B >> do this thing >> fi > > Will be

Re: [RFC PATCH v2 1/1] rebase-interactive: Add git_rebase__interactive__preserve_merges

2018-03-21 Thread Wink Saville
On Wed, Mar 21, 2018 at 12:42 PM, Junio C Hamano wrote: > Wink Saville writes: > >> Refactor git_rebase__interactive__preserve_merges out of >> git_rebase__interactive resulting in fewer conditionals making >> both routines are simpler. >> >> Changed

Re: [RFC PATCH v2 1/1] rebase-interactive: Add git_rebase__interactive__preserve_merges

2018-03-21 Thread Junio C Hamano
Wink Saville writes: > Refactor git_rebase__interactive__preserve_merges out of > git_rebase__interactive resulting in fewer conditionals making > both routines are simpler. > > Changed run_specific_rebase in git-rebase to dispatch to the appropriate > function after sourcing

[RFC PATCH v2 1/1] rebase-interactive: Add git_rebase__interactive__preserve_merges

2018-03-21 Thread Wink Saville
Refactor git_rebase__interactive__preserve_merges out of git_rebase__interactive resulting in fewer conditionals making both routines are simpler. Changed run_specific_rebase in git-rebase to dispatch to the appropriate function after sourcing git-rebase--interactive. ---