Re: [PATCH v3 4/7] git-rebase: error out when incompatible options passed

2018-06-21 Thread Elijah Newren
On Thu, Jun 21, 2018 at 1:29 PM, Junio C Hamano wrote: > Elijah Newren writes: > >> +if test -n "$git_am_opt"; then >> + incompatible_opts=$(echo "$git_am_opt" | sed -e 's/ -q//') > > This is probably just a taste-thing, but I'd probably prefer to see > the "sed" filter out "-q" alone, and ma

Re: [PATCH v3 4/7] git-rebase: error out when incompatible options passed

2018-06-21 Thread Junio C Hamano
Elijah Newren writes: > +if test -n "$git_am_opt"; then > + incompatible_opts=$(echo "$git_am_opt" | sed -e 's/ -q//') This is probably just a taste-thing, but I'd probably prefer to see the "sed" filter out "-q" alone, and make an effort to leave future things like "-qx" alone, e.g. $(

[PATCH v3 4/7] git-rebase: error out when incompatible options passed

2018-06-21 Thread Elijah Newren
git rebase has three different types: am, merge, and interactive, all of which are implemented in terms of separate scripts. am builds on git-am, merge builds on git-merge-recursive, and interactive builds on git-cherry-pick. We make use of features in those lower-level commands in the different