From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH 2/2] dim: Stop force-pushing tags
Date: Tue, 21 Mar 2017 13:44:01 +0200 [thread overview]
Message-ID: <87y3vyam7y.fsf@intel.com> (raw)
In-Reply-To: <20170321090848.9397-2-daniel.vetter@ffwll.ch>
On Tue, 21 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> It's evil. And if you've catastrophically screwed up a pull request
> it's probably better to be forced to wait 1 day.
I have to disagree with that. When I suggested we stop overwriting tags,
I meant we should check if the tag exists, and add a sequence number at
the end. Or always add HHMM there too.
BR,
Jani.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> dim | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/dim b/dim
> index 6a5987ac5c53..821147510dc5 100755
> --- a/dim
> +++ b/dim
> @@ -1329,13 +1329,13 @@ function dim_update_next_continue
>
> git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE drm-intel-next-queued:drm-intel-next
> tag=drm-intel-next-$today
> - $DRY git tag -f -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> - git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
> + $DRY git tag -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> + git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
>
> echo "Updating drm-intel-testing to latest drm-tip"
> git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$remote/drm-tip:drm-intel-testing
> - $DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
> - $DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
> + $DRY git tag drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
> + $DRY git push $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
>
> cat > ~/tmp/test-request <<-HERE
> Hi all,
> @@ -1371,8 +1371,8 @@ function dim_tag_next
> echo "Tagging current drm-intel-next"
>
> tag=drm-intel-next-$today
> - $DRY git tag -f $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> - git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
> + $DRY git tag $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
> + git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $tag
> else
> echo "drm-intel-next not up-to-date, aborting"
> exit
> @@ -1413,8 +1413,8 @@ function dim_pull_request
> else
> tag=$branch-$today
> gitk "$branch@{upstream}" ^$upstream &
> - $DRY git tag -f -a $tag "$branch@{upstream}"
> - $DRY git push -f $remote $tag
> + $DRY git tag -a $tag "$branch@{upstream}"
> + $DRY git push $remote $tag
> prep_pull_mail $tag
>
> repo=$(branch_to_repo $branch)
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-03-21 11:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 9:08 [PATCH 1/2] dim: Run gitk before tagging Daniel Vetter
2017-03-21 9:08 ` [PATCH 2/2] dim: Stop force-pushing tags Daniel Vetter
2017-03-21 11:44 ` Jani Nikula [this message]
2017-03-21 12:58 ` [PATCH 1/2] " Daniel Vetter
2017-03-21 12:58 ` [PATCH 2/2] dim: really make the branch argument for dim retip optional Daniel Vetter
2017-03-21 14:13 ` Jani Nikula
2017-03-21 15:27 ` Daniel Vetter
2017-03-22 8:42 ` Jani Nikula
2017-03-21 14:12 ` [PATCH 1/2] dim: Stop force-pushing tags Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y3vyam7y.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.