On Mon, 30 Apr 2018, Daniel Vetter <daniel.vet...@ffwll.ch> 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> > --- > 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
Please use return 1 whenever possible. The set -e will abort at the call site, unless the caller explicitly handles fail exit status. exit 1 doesn't leave the caller that option. BR, Jani. > + fi > + > + echo Pulling $pull_branch ... > > git fetch $pull_branch > for sha1 in $(git rev-list "HEAD..FETCH_HEAD" --no-merges) ; do -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
