On Mon, Nov 22, 2021 at 3:38 PM Jani Nikula <jani.nik...@linux.intel.com> wrote: > > On Tue, 16 Nov 2021, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: > > There's nothing we can do, but also I was baffled about what's going on. > > The reason was that a topic branch was deleted on the server, but not > > removed from nightly.conf. Which means git merge fails, but not in a way > > we expect, so we keep falling over until this git commit (which should > > always succeed) also falls over and the scrip just stops. > > > > Make the failure a notch more verbose for next time around. > > Reviewed-by: Jani Nikula <jani.nik...@intel.com> > > on both
Thanks, both pushed. -Daniel > > > > > Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> > > --- > > dim | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/dim b/dim > > index 9da768fe5f5b..d382d41bbb5c 100755 > > --- a/dim > > +++ b/dim > > @@ -798,7 +798,10 @@ function dim_rebuild_tip > > > > # because we filter out fast-forward merges there will > > # always be something to commit > > - git commit --no-edit --quiet --no-verify > > + if ! git commit --no-edit --quiet --no-verify ; then > > + echoerr "Commit failed, missing topic branch?" > > + return 1 > > + fi > > echo "Done." > > fi > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
