This is mostly unchanged since the previous round, except that

 * The option is spelled "--force-with-lease=<ref>:<expect>".
   Nobody liked "cas" as it was too technical, many disliked
   "lockref" because "lock" sounded as if push by others were
   excluded by it while in fact this is to fail us.

   The final name implies that it is related to the "--force" that
   breaks the "must fast-forward" safety, but "with-lease" part
   conveys that there is some reservation with the forcing.  The
   observation you make before you start rebasing (or you ensure
   that everything is expendable and decide to delete) is like
   taking a lease on the ref, and as long as the lease is not
   broken by others, you can push a non-fast-forward history to
   replace what is at the remote.

 * The logic to choose default when the option is not given with an
   explicit expected value is still "the remote-tracking branch for
   the ref being updated", but the documentation warns users against
   relying on that semantics, as it was shown to be fragile during
   the discussion, and hopefully we will come up with a better and
   more robust one to replace it.

The first two preparatory patches are the same since v2.  For the
remainder, other than changes necessary to rename the option, the
documentation part of [PATCH 3/6] has been updated to mark forms
without explicit expect value as experimental.

Junio C Hamano (6):
  cache.h: move remote/connect API out of it
  builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN
  remote.c: add command line option parser for "--force-with-lease"
  push --force-with-lease: implement logic to populate old_sha1_expect[]
  push --force-with-lease: tie it all together
  t5533: test "push --force-with-lease"

 Documentation/git-push.txt |  77 +++++++++++++++---
 builtin/fetch-pack.c       |   2 +
 builtin/push.c             |  19 ++++-
 builtin/receive-pack.c     |   1 +
 builtin/send-pack.c        |  26 +++++++
 cache.h                    |  62 ---------------
 connect.c                  |   1 +
 connect.h                  |  13 ++++
 fetch-pack.c               |   1 +
 fetch-pack.h               |   1 +
 refs.c                     |   8 --
 remote.c                   | 175 +++++++++++++++++++++++++++++++++++++----
 remote.h                   |  83 ++++++++++++++++++++
 send-pack.c                |   2 +
 t/        | 189 +++++++++++++++++++++++++++++++++++++++++++++
 transport-helper.c         |   6 ++
 transport.c                |  13 ++++
 transport.h                |   5 ++
 upload-pack.c              |   1 +
 19 files changed, 588 insertions(+), 97 deletions(-)
 create mode 100644 connect.h
 create mode 100755 t/


To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to