Thread (9 messages) flat view 9 messages, 2 authors, 2016-06-15

Re: [PATCH v2 0/5] push: update remote tags only with force

From: Jeff King <hidden>
Date: 2016-06-15 22:55:13

On Sun, Nov 04, 2012 at 09:08:23PM -0600, Chris Rorvick wrote:
Patch series to prevent push from updating remote tags w/o forcing them.
Split out original patch to ease review.

Chris Rorvick (5):
  push: return reject reasons via a mask
  push: add advice for rejected tag reference
  push: flag updates
  push: flag updates that require force
  push: update remote tags only with force

 Documentation/git-push.txt |   10 +++++-----
 builtin/push.c             |   24 +++++++++++++++---------
 builtin/send-pack.c        |    6 ++++++
 cache.h                    |    7 ++++++-
 remote.c                   |   39 +++++++++++++++++++++++++++++++--------
 t/t5516-fetch-push.sh      |   30 +++++++++++++++++++++++++++++-
 transport-helper.c         |    6 ++++++
 transport.c                |   25 +++++++++++++++----------
 transport.h                |   10 ++++++----
 9 files changed, 119 insertions(+), 38 deletions(-)
I have not looked carefully at this topic yet, but I did try merging it
to "pu" and found that it had some textual conflicts with the
nd/builtin-to-libgit topic, which moves some builtin/send-pack.c code to
send-pack.c. Since I am graduating that topic to master, I went ahead
and just rebased your topic on top.

If you do a re-roll, please use an updated master, and feel free to
grab (and double-check!) the rebase I am about to send out in 'pu'. I
also included the minor signed/unsigned pointer warning fixup in the
rebase, too.

-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help