On Tue, May 01, 2018 at 04:29:10PM -0400, Sean Paul wrote: > On Mon, Apr 30, 2018 at 08:29:57AM +0200, Daniel Vetter wrote: > > We're relying on get fetch failing and set -e, but that doesn't work > > if we parse nothing: In that case git fetch just fetches upstream and > > succeed. Dave stumbled over this by feeding a .mbox with dos linefeeds > > into dim. > > > > Cc: Dave Airlie <airl...@gmail.com> > > Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> > > Reviewed-by: Sean Paul <seanp...@chromium.org>
Sean confirmed on irc this also holds for v2, so I pushed. -Daniel > > > --- > > dim | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/dim b/dim > > index ec51e36b1269..63163614ea17 100755 > > --- a/dim > > +++ b/dim > > @@ -901,7 +901,12 @@ function dim_apply_pull > > > > pull_branch=$(sed -e '0,/[gG]it repository at:$/d' $file | head -n 2 | > > tail -n 1) > > > > - echo $pull_branch > > + if [[ "$pull_branch" == "" ]] ; then > > + echoerr "no pull request found" > > + exit 1 > > + fi > > + > > + echo Pulling $pull_branch ... > > > > git fetch $pull_branch > > for sha1 in $(git rev-list "HEAD..FETCH_HEAD" --no-merges) ; do > > -- > > 2.17.0 > > > > _______________________________________________ > > dim-tools mailing list > > dim-tools@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dim-tools > > -- > Sean Paul, Software Engineer, Google / Chromium OS -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
