This reverts commit 6ce0305a8b99bc51a285c0f96cb226378c7834ae.
We need to filter both using --first-parent (for proper backmerges)
and --committer (for fast-forward merges).
Cc: Sean Paul <s...@poorly.run>
Cc: Maxime Ripard <maxime.rip...@bootlin.com>
Cc: Jani Nikula <jani.nik...@linux.intel.com>
Reported-by: Jani Nikula <jani.nik...@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vet...@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 "$@"
--
2.20.1
_______________________________________________
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
