fromupstream: pause again if a conflict isn't resolved
Typically this happens when the user forgets to run `git am --continue`
or similar, like so:
$ fromupstream pw://12345 --bug chromium:123 --test "not really"
Please resolve the conflicts and restart the shell job when done. …
$ (fix the conflicts)
$ git add foo.be
Previously, this would add TEST=, BUG=, etc. to whatever was at HEAD
before, which is quite annoying and not immediately obvious. Now it'll
show an error and pause the script again.
TEST=`fromupstream msgid://email@example.com --buganizer 14987353 --test TODO`
then `fg` immediately (multiple times if you like). Then run `git
am --continue` and run `fg` one last time; it should then succeed.
Commit-Queue: Harry Cutts <firstname.lastname@example.org>
Tested-by: Harry Cutts <email@example.com>
Reviewed-by: Douglas Anderson <firstname.lastname@example.org>
1 file changed