Re: Re*: [PATCH 1/2] rebase -i --autosquash: demonstrate a problem skipping the last squash

2018-09-05 Thread Junio C Hamano
Johannes Schindelin writes: > On Tue, 4 Sep 2018, Junio C Hamano wrote: > >> "Johannes Schindelin via GitGitGadget" >> writes: >> >> > + test_must_fail git -c core.editor="grep -q ^pick" \ >> > + rebase -ki --autosquash HEAD~4 && >> >> When merged to 'pu', this reveals that "git

Re: Re*: [PATCH 1/2] rebase -i --autosquash: demonstrate a problem skipping the last squash

2018-09-04 Thread Johannes Schindelin
Hi Junio, On Tue, 4 Sep 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > + test_must_fail git -c core.editor="grep -q ^pick" \ > > + rebase -ki --autosquash HEAD~4 && > > When merged to 'pu', this reveals that "git rebase" rewritten in C > knows

Re*: [PATCH 1/2] rebase -i --autosquash: demonstrate a problem skipping the last squash

2018-09-04 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > + test_must_fail git -c core.editor="grep -q ^pick" \ > + rebase -ki --autosquash HEAD~4 && When merged to 'pu', this reveals that "git rebase" rewritten in C knows "--keep-empty" but not "-k". I did a quick eyeballing between