On Wednesday, 2018-11-07 13:38:26 +0000, Eric Engestrom wrote: > On Wednesday, 2018-11-07 12:07:16 +0000, Emil Velikov wrote: > > From: Emil Velikov <emil.veli...@collabora.com> > > > > With later commits we'll fold all the different scripts into one. > > Add the explicit prefix, so that we know the origin of the nomination > > > > Signed-off-by: Emil Velikov <emil.veli...@collabora.com> > > --- > > bin/get-pick-list.sh | 21 ++++++++++++++++++++- > > 1 file changed, 20 insertions(+), 1 deletion(-) > > > > diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh > > index ba741cc4114..33a8a4cba48 100755 > > --- a/bin/get-pick-list.sh > > +++ b/bin/get-pick-list.sh > > @@ -7,6 +7,15 @@ > > # $ bin/get-pick-list.sh > > # $ bin/get-pick-list.sh > picklist > > # $ bin/get-pick-list.sh | tee picklist > > +# > > +# The output is as follows: > > +# [nominaiton_type] commit_sha commit summary > > + > > +is_stable_nomination() > > +{ > > + stable=`git show --summary $sha | grep -i -o "CC:.*mesa-stable"` > > `stable` is unused; you could simply give `-q` to grep to suppress its > output. > > > + return $? > > This is already the normal behaviour of a shell function, you can drop > it. > > (both of these also apply to is_typod_nomination() in the next patch) > > > +} > > > > # Use the last branchpoint as our limit for the search > > latest_branchpoint=`git merge-base origin/master HEAD` > > @@ -32,7 +41,17 @@ do > > continue > > fi > > > > - git --no-pager show --summary --oneline $sha > > + tag=none > > + if is_stable_nomination; then > > + tag=stable > > + fi > > + > > + if test tag = none; then > > s/tag/$tag/ > > > + continue > > + fi > > + > > + printf "[ %8s ] %s\n" \ > > + "$tag" "`git --no-pager show --summary --oneline $sha`" > > I'd leave the git invocation out of the printf: > > printf "[ %8s ] " "$tag" > git --no-pager show --summary --oneline $sha > > With those fixed, 3 and 4 are:
Sorry, I obviously meant 2 (this patch) and 3 :) > Reviewed-by: Eric Engestrom <eric.engest...@intel.com> > > > done > > > > rm -f already_picked > > -- > > 2.19.1 > > > > _______________________________________________ > > mesa-dev mailing list > > mesa-dev@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev