summaryrefslogtreecommitdiff
path: root/builtin/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-08 21:42:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-23 05:33:21 (GMT)
commit631b5ef219c41027c144218e25075062b91f9471 (patch)
treebe26e0d749b7c4826c9e7874f70432de504b33c4 /builtin/send-pack.c
parent91048a9537a4716c84934e4f8ed114a20606d3ff (diff)
downloadgit-631b5ef219c41027c144218e25075062b91f9471.zip
git-631b5ef219c41027c144218e25075062b91f9471.tar.gz
git-631b5ef219c41027c144218e25075062b91f9471.tar.bz2
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 'builtin/send-pack.c')
-rw-r--r--builtin/send-pack.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 6027ead..41dc512 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -55,6 +55,11 @@ static void print_helper_status(struct ref *ref)
msg = "needs force";
break;
+ case REF_STATUS_REJECT_STALE:
+ res = "error";
+ msg = "stale info";
+ break;
+
case REF_STATUS_REJECT_ALREADY_EXISTS:
res = "error";
msg = "already exists";