summaryrefslogtreecommitdiffstats
path: root/remote.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-08 23:42:40 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-23 07:33:21 +0200
commit631b5ef219c41027c144218e25075062b91f9471 (patch)
treebe26e0d749b7c4826c9e7874f70432de504b33c4 /remote.h
parentpush --force-with-lease: implement logic to populate old_sha1_expect[] (diff)
downloadgit-631b5ef219c41027c144218e25075062b91f9471.tar.xz
git-631b5ef219c41027c144218e25075062b91f9471.zip
push --force-with-lease: tie it all together
This teaches the deepest part of the callchain for "git push" (and "git send-pack") to enforce "the old value of the ref must be this, otherwise fail this push" (aka "compare-and-swap" / "--lockref"). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.h')
-rw-r--r--remote.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/remote.h b/remote.h
index ca3c8c8de8..6c42554cc2 100644
--- a/remote.h
+++ b/remote.h
@@ -107,6 +107,7 @@ struct ref {
REF_STATUS_REJECT_NODELETE,
REF_STATUS_REJECT_FETCH_FIRST,
REF_STATUS_REJECT_NEEDS_FORCE,
+ REF_STATUS_REJECT_STALE,
REF_STATUS_UPTODATE,
REF_STATUS_REMOTE_REJECT,
REF_STATUS_EXPECTING_REPORT