From: Chris Rorvick <chris@rorvick.com>
To: git@vger.kernel.org
Cc: Chris Rorvick <chris@rorvick.com>,
Angelo Borsotti <angelo.borsotti@gmail.com>,
Drew Northup <n1xim.email@gmail.com>,
Michael Haggerty <mhagger@alum.mit.edu>,
Philip Oakley <philipoakley@iee.org>,
Johannes Sixt <j6t@kdbg.org>,
Kacper Kornet <draenog@pld-linux.org>, Jeff King <peff@peff.net>,
Felipe Contreras <felipe.contreras@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v5 0/7] push: update remote tags only with force
Date: Thu, 22 Nov 2012 22:21:48 -0600 [thread overview]
Message-ID: <1353644515-17349-1-git-send-email-chris@rorvick.com> (raw)
Incorporated Junio's feedback. Also, I broke the last patch of the
previous series out into three to make the changes more clear.
This patch set can be divided into two sets:
1. Provide useful advice for rejected tag references.
push: return reject reasons via a mask
push: add advice for rejected tag reference
Recommending a merge to resolve a rejected tag update seems
nonsensical since the tag does not come along for the ride. These
patches change the advice for rejected tags to suggest using
"push -f".
2. Require force when updating tag references, even on a fast-forward.
push: flag updates
push: flag updates that require force
push: require force for refs under refs/tags/
push: require force for annotated tags
push: clarify rejection of update to non-commit-ish
This is in response to the following thread:
http://thread.gmane.org/gmane.comp.version-control.git/208354
This series prevents fast-forwards if the reference is under the
refs/tags/* hierarchy or if the old object is a tag.
Chris Rorvick (7):
push: return reject reasons via a mask
push: add advice for rejected tag reference
push: flag updates
push: flag updates that require force
push: require force for refs under refs/tags/
push: require force for annotated tags
push: clarify rejection of update to non-commit-ish
Documentation/git-push.txt | 9 ++++---
builtin/push.c | 24 ++++++++++-------
builtin/send-pack.c | 9 +++++--
cache.h | 7 ++++-
remote.c | 65 +++++++++++++++++++++++++++++++++++++---------
send-pack.c | 1 +
t/t5516-fetch-push.sh | 44 ++++++++++++++++++++++++++++++-
transport-helper.c | 6 +++++
transport.c | 25 +++++++++++-------
transport.h | 10 ++++---
10 files changed, 157 insertions(+), 43 deletions(-)
--
1.8.0.209.gf3828dc
next reply other threads:[~2012-11-23 4:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-23 4:21 Chris Rorvick [this message]
2012-11-23 4:21 ` [PATCH 1/7] push: return reject reasons via a mask Chris Rorvick
2012-11-26 18:43 ` Junio C Hamano
2012-11-27 3:00 ` Chris Rorvick
2012-11-23 4:21 ` [PATCH 2/7] push: add advice for rejected tag reference Chris Rorvick
2012-11-23 4:21 ` [PATCH 3/7] push: flag updates Chris Rorvick
2012-11-23 4:21 ` [PATCH 4/7] push: flag updates that require force Chris Rorvick
2012-11-23 4:21 ` [PATCH 5/7] push: require force for refs under refs/tags/ Chris Rorvick
2012-11-26 18:57 ` Junio C Hamano
2012-11-27 4:17 ` Chris Rorvick
2012-11-27 17:12 ` Junio C Hamano
2012-11-28 5:18 ` [PATCH] push: cleanup push rules comment Chris Rorvick
2012-11-28 16:58 ` Junio C Hamano
2012-11-23 4:21 ` [PATCH 6/7] push: require force for annotated tags Chris Rorvick
2012-11-23 4:21 ` [PATCH 7/7] push: clarify rejection of update to non-commit-ish Chris Rorvick
2012-11-26 18:53 ` Junio C Hamano
2012-11-27 3:52 ` Chris Rorvick
2012-11-27 17:11 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353644515-17349-1-git-send-email-chris@rorvick.com \
--to=chris@rorvick.com \
--cc=angelo.borsotti@gmail.com \
--cc=draenog@pld-linux.org \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=mhagger@alum.mit.edu \
--cc=n1xim.email@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).