[PATCH v2 2/2] dim: Make sure we push the branch before creating a tag

[Daniel Vetter]

On Thu, Oct 10, 2019 at 11:49:03AM +0200, Maxime Ripard wrote:
> The current dim code will create the tag using a local branch as an
> argument, but while we make sure to fetch the branch first in the callers,
> we don't actually make sure that any local change have been pushed.
> 
> Make sure it's the case before creating the tag.
> 
> Signed-off-by: Maxime Ripard <mripard at kernel.org>
> 
> ---
> 
> Changes from v1:
>   - Switch to git_push
> ---
>  dim | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/dim b/dim
> index 0b1cd042345f..b581f246c5cc 100755
> --- a/dim
> +++ b/dim
> @@ -1962,6 +1962,7 @@ function tag_branch
>  	branch=$2
>  	remote=$(branch_to_remote $branch)
>  
> +	git_push $remote $branch

>From a tool safety pov, not sure anymore this is the right thing to do.
You might end up push accidental garbage and fun stuff like that, since
this bypasses the usual checks dim push-branch does.

I think a check using git merge-base --is-ancestor and bailing out if your
local branch isn't contained in upstream (tagging something that's older
than latest upstream is legit imo) would be much better. Thoughts?

Applied patch 1 meanwhile.
-Daniel
>  	tag_summary $branch | $DRY git tag -F- $tag "$branch@{upstream}"
>  	$DRY git tag -a $DIM_GPG_KEYID -f $tag
>  	git_push $remote $tag
> -- 
> 2.23.0
> 
> _______________________________________________
> 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