[PATCH] dim: Only check the commit range on the first parent when doing a PR

[Daniel Vetter]

On Tue, Aug 25, 2020 at 3:35 PM Maxime Ripard <maxime at cerno.tech> wrote:
>
> When creating a PR the current code will try to validate the whole range of
> commits between the upstream and the branch we want to create a PR for.
>
> However, if we have merged a tag that isn't in the upstream yet, we will
> validate the range between upstream and that tag as well, even though it's
> very likely to not follow our rules.
>
> Let's make sure we only consider the first parent, and thus our branch.
>
> Signed-off-by: Maxime Ripard <maxime at cerno.tech>

But this misses stuff when you pull in topic branches, which generally
should follow our rules. So if this has been just because of the
backmerge I'd leave it as-is, if some topic branch from a non-drm
maintainer upset things, I guess maybe need to reconsider.
-Daniel

> ---
>  dim | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dim b/dim
> index e4f4d2e95af0..25c77483dca0 100755
> --- a/dim
> +++ b/dim
> @@ -2108,7 +2108,7 @@ function dim_pull_request
>
>                 repo="drm-intel"
>         else
> -               checkpatch_commit_push_range 1 "$upstream..$branch"
> +               checkpatch_commit_push_range 1 "$upstream..$branch" --first-parent
>                 tag=$(tag_name "$branch")
>                 gitk --first-parent "$branch" ^$upstream &
>                 tag_branch $tag $branch
> --
> 2.26.2
>
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools



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