[PATCH] Revert "dim: Only check our own commits"

[Jani Nikula]

On Tue, 15 Jan 2019, Daniel Vetter <daniel.vetter at ffwll.ch> 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 <jani.nikula at intel.com>


BR,
Jani.


>
> We need to filter both using --first-parent (for proper backmerges)
> and --committer (for fast-forward merges).
>
> Cc: Sean Paul <sean at poorly.run>
> Cc: Maxime Ripard <maxime.ripard at bootlin.com>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Reported-by: Jani Nikula <jani.nikula at linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  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