Add a new option: "--force-if-includes" to "git-push" where forced
updates are allowed only if the tip of the remote-tracking ref has
been integrated locally, by verifying if the tip of the remote-tracking
ref -- on which a local branch has based on -- is reachable from at
least one of the "reflog" entries of the branch about to be updated
by force on the remote.
This option can be used with "--force-with-lease" with setups where
the remote-tracking refs of the repository are implicitly updated in
the background to help prevent unintended remote overwrites.
If a local branch is based on a remote ref for a rewrite, and if that
remote-tracking ref is updated by a push from another repository after
it has been checked out locally, force updating that branch to remote
with "--force-with-lease[=<refname>[:<expect>]]" without specifying
the "<expect>" value, can cause the update that happened in-between
the checkout and forced push to be lost.
Changes since v8:
- Disable "commit-graph" when "in_merge_bases_many()" is called
for this check, because it returns different results depending
on whether "commit-graph" is enabled [1].
- Rename the commit list name, remove redundant comments and fix
some typos.
Srinidhi Kaushik (3):
push: add reflog check for "--force-if-includes"
push: parse and set flag for "--force-if-includes"
t, doc: update tests, reference for "--force-if-includes"
Documentation/config/advice.txt | 9 +-
Documentation/config/push.txt | 6 +
Documentation/git-push.txt | 26 ++++-
advice.c | 3 +
advice.h | 2 +
builtin/push.c | 27 +++++
builtin/send-pack.c | 12 ++
remote-curl.c | 14 ++-
remote.c | 198 ++++++++++++++++++++++++++++++--
remote.h | 12 +-
send-pack.c | 1 +
t/t5533-push-cas.sh | 137 ++++++++++++++++++++++
transport-helper.c | 10 ++
transport.c | 8 ++
transport.h | 15 ++-
15 files changed, 462 insertions(+), 18 deletions(-)
base-commit: 306ee63a703ad67c54ba1209dc11dd9ea500dc1f
[1] https://public-inbox.org/git/xmqqtuvhn6yx.fsf@xxxxxxxxxxxxxxxxxxxxxx
--
2.28.0
