Commit 6d47e41e authored by Jani Nikula's avatar Jani Nikula

dim: optionally launch gitk with changelog on dim tag-branch

Similar to what pull-request currently does. Try to be clever about not
including all unmerged changes, just the ones that haven't been tagged
yet.
Reviewed-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula's avatarJani Nikula <jani.nikula@intel.com>
parent 2395ed75
Pipeline #11679 failed with stages
in 1 minute and 10 seconds
......@@ -1898,9 +1898,10 @@ function dim_update_next_continue
function dim_tag_branch
{
local branch remote tag
local branch upstream remote tag unmerged_tags
branch=$1
branch=${1:?$usage}
upstream=$2
assert_branch $branch
remote=$(branch_to_remote $branch)
......@@ -1915,6 +1916,16 @@ function dim_tag_branch
echo "Tagging current $branch"
if [[ -n "$upstream" ]]; then
# If there are unmerged tags, show changes since last
unmerged_tags=$(git_unmerged_tags "$branch" "$upstream")
if [[ -n "$unmerged_tags" ]]; then
upstream="${unmerged_tags%% *}"
fi
gitk --first-parent "$branch" "^$upstream" &
fi
tag=$(tag_name "$branch")
tag_branch $tag $branch
git push $DRY_RUN $remote $tag
......
......@@ -374,13 +374,15 @@ When **update-next** fails to push the special release commit (because it raced
another committer) rebase and push manually, and then continue using this
command.
tag-branch *branch*
-------------------
tag-branch *branch* [*upstream*]
--------------------------------
Pushes a new tag for the specified branch after checking that the remote is
up-to-date.
The tag will be signed using the key specified by \$DIM_GPG_KEYID, if set.
If upstream is provided, launch gitk to show the changes to be tagged.
tag-next
--------
**tag-branch** shorthand for drm-intel-next.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment