On Tue, 15 Jan 2019, Daniel Vetter <[email protected]> wrote: > This reverts commit 6ce0305a8b99bc51a285c0f96cb226378c7834ae.
Calling it a revert is a bit funny because you combine both the old and the new things. Update while applying if you agree. But let's go with this and see how it plays out. ;) Reviewed-by: Jani Nikula <[email protected]> BR, Jani. > > We need to filter both using --first-parent (for proper backmerges) > and --committer (for fast-forward merges). > > Cc: Sean Paul <[email protected]> > Cc: Maxime Ripard <[email protected]> > Cc: Jani Nikula <[email protected]> > Reported-by: Jani Nikula <[email protected]> > Signed-off-by: Daniel Vetter <[email protected]> > --- > dim | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dim b/dim > index db7de5502fb8..138a0518cc3f 100755 > --- a/dim > +++ b/dim > @@ -867,7 +867,7 @@ function checkpatch_commit_push_range > # push. > function dim_push_branch > { > - local branch remote > + local branch remote committer_email > > branch=${1:?$usage} > shift > @@ -876,7 +876,9 @@ function dim_push_branch > > remote=$(branch_to_remote $branch) > > - checkpatch_commit_push_range 1 "$branch@{u}..$branch" --first-parent > + committer_email=$(git_committer_email) > + > + checkpatch_commit_push_range 1 "$branch@{u}..$branch" --first-parent > --committer="$committer_email" > > git push $DRY_RUN $remote $branch "$@" -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
