On Wed, 17 Oct 2018, Daniel Vetter <[email protected]> wrote: > Somewhere since I originally typed this and today git apply-mbox lost > the error status for "this patch didn't apply cleanly". So instead of > exiting, we happily continue on and add Link: tags and other nonsense > to the current patch, instead of the one that we wanted to apply. > > Fix this. > > v2: It wasn't git am, it was us, wrapping the apply_patch function in > an if, which defeats set -e. Add explicit error handling. Thanks to > Jani for figuring this one out.
Thanks for fixing this. Reviewed-by: Jani Nikula <[email protected]> > > Cc: Jani Nikula <[email protected]> > Signed-off-by: Daniel Vetter <[email protected]> > --- > dim | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/dim b/dim > index af092e50bb08..8be504e46995 100755 > --- a/dim > +++ b/dim > @@ -924,7 +924,10 @@ function apply_patch #patch_file > sob=-s > fi > > - git am --scissors -3 $sob "$@" $patch > + if ! git am --scissors -3 $sob "$@" $patch ; then > + echoerr "ERROR: git apply-mbox failed" > + return 1 > + fi > > if [ -n "$message_id" ]; then > dim_commit_add_tag "Link: > https://patchwork.freedesktop.org/patch/msgid/$message_id"; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
