git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 0/7] push: update remote tags only with force

From
Chris Rorvick <chris@rorvick.com>
Date
Nov 23, 2012, 04:21 UTC
Message-ID
<1353644515-17349-1-git-send-email-chris@rorvick.com>

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: Chris Rorvick
Message 1 of 18 in “push: update remote tags only with force”
  1. 0/7 push: update remote tags only with forceChris Rorvick, Nov 23, 2012
  2. 1/7 push: return reject reasons via a maskChris Rorvick, Nov 23, 2012
  3. Junio C HamanoNov 26, 2012
  4. Chris RorvickNov 27, 2012
  5. 2/7 push: add advice for rejected tag referenceChris Rorvick, Nov 23, 2012
  6. 3/7 push: flag updatesChris Rorvick, Nov 23, 2012
  7. 4/7 push: flag updates that require forceChris Rorvick, Nov 23, 2012
  8. 5/7 push: require force for refs under refs/tags/Chris Rorvick, Nov 23, 2012
  9. Junio C HamanoNov 26, 2012
  10. Chris RorvickNov 27, 2012
  11. Junio C HamanoNov 27, 2012
  12. push: cleanup push rules commentChris Rorvick, Nov 28, 2012
  13. Junio C HamanoNov 28, 2012
  14. 6/7 push: require force for annotated tagsChris Rorvick, Nov 23, 2012
  15. 7/7 push: clarify rejection of update to non-commit-ishChris Rorvick, Nov 23, 2012
  16. Junio C HamanoNov 26, 2012
  17. Chris RorvickNov 27, 2012
  18. Junio C HamanoNov 27, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.