On Fri, 11 Jan 2019, Daniel Vetter <[email protected]> wrote:
> Originally we used the committer to filter for this, but --first-parent
> is better.
>
> Reviewed-and-tested-by: Sean Paul <[email protected]>
> Cc: Sean Paul <[email protected]>
> Cc: Maxime Ripard <[email protected]>
> Signed-off-by: Daniel Vetter <[email protected]>
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.
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
_______________________________________________
dim-tools mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dim-tools
