Hi Gábor, On Thu, 23 Aug 2018, SZEDER Gábor wrote: > The verbose output of the test 'reword without issues functions as > intended' in 't3423-rebase-reword.sh', added in a9279c6785 (sequencer: > do not squash 'reword' commits when we hit conflicts, 2018-06-19), > contains the following error output: > > sed: -e expression #1, char 2: extra characters after command > > This error comes from within the 'fake-editor.sh' script created by > 'lib-rebase.sh's set_fake_editor() function, and the root cause is the > FAKE_LINES="pick 1 reword 2" variable in the test in question, in > particular the "pick" word. 'fake-editor.sh' assumes 'pick' to be the > default rebase command and doesn't support an explicit 'pick' command > in FAKE_LINES. As a result, 'pick' will be used instead of a line > number when assembling the following 'sed' script: > > sed -n picks/^pick/pick/p > > which triggers the aforementioned error. > > Luckily, this didn't affect the test's correctness: the erroring 'sed' > command doesn't write anything to the todo script, and processing the > rest of FAKE_LINES generates the desired todo script, as if that > 'pick' command were not there at all. > > The minimal fix would be to remove the 'pick' word from FAKE_LINES, > but that would leave us susceptible to similar issues in the future. > > Instead, teach the fake-editor script to recognize an explicit 'pick' > command, which is still a fairly trivial change. > > In the future we might want to consider reinforcing this fake editor > script with an &&-chain and stricter parsing of the FAKE_LINES > variable (e.g. to error out when encountering unknown rebase commands > or commands and line numbers in the wrong order). > > Signed-off-by: SZEDER Gábor ACK! Thank you very much, Dscho > --- > t/lib-rebase.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh > index 25a77ee5cb..592865d019 100644 > --- a/t/lib-rebase.sh > +++ b/t/lib-rebase.sh > @@ -47,7 +47,7 @@ set_fake_editor () { > action=pick > for line in $FAKE_LINES; do > case $line in > - squash|fixup|edit|reword|drop) > + pick|squash|fixup|edit|reword|drop) > action="$line";; > exec*) > echo "$line" | sed 's/_/ /g' >> "$1";; > -- > 2.19.0.rc0.136.gd2dd172e64 > >