[PATCH] dim: Only check our own commits

Daniel Vetter daniel at ffwll.ch
Tue Jan 15 10:14:03 UTC 2019


On Mon, Jan 14, 2019 at 12:43:07PM +0200, Jani Nikula wrote:
> On Fri, 11 Jan 2019, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> > Originally we used the committer to filter for this, but --first-parent
> > is better.
> >
> > Reviewed-and-tested-by: Sean Paul <sean at poorly.run>
> > Cc: Sean Paul <sean at poorly.run>
> > Cc: Maxime Ripard <maxime.ripard at bootlin.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> 
> This may work with merges, but for rebasing branches such as
> drm-intel-fixes this makes it worse. Now that I rebased drm-intel-fixes
> on top of v5.0-rc2 I couldn't push it without dim -f after this change.

Oh right I forgot, I'll send out the partial revert which keeps both.
-Daniel

> 
> BR,
> Jani.
> 
> > ---
> >  dim | 6 ++----
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/dim b/dim
> > index dafbf946e0b7..2be7ea61c0cd 100755
> > --- a/dim
> > +++ b/dim
> > @@ -867,7 +867,7 @@ function checkpatch_commit_push_range
> >  # push.
> >  function dim_push_branch
> >  {
> > -	local branch remote committer_email
> > +	local branch remote
> >  
> >  	branch=${1:?$usage}
> >  	shift
> > @@ -876,9 +876,7 @@ function dim_push_branch
> >  
> >  	remote=$(branch_to_remote $branch)
> >  
> > -	committer_email=$(git_committer_email)
> > -
> > -	checkpatch_commit_push_range 1 "$branch@{u}..$branch" --committer="$committer_email"
> > +	checkpatch_commit_push_range 1 "$branch@{u}..$branch" --first-parent
> >  
> >  	git push $DRY_RUN $remote $branch "$@"
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dim-tools mailing list