diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-08 14:42:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 22:33:21 -0700 |
| commit | 631b5ef219c41027c144218e25075062b91f9471 (patch) | |
| tree | be26e0d749b7c4826c9e7874f70432de504b33c4 /builtin/send-pack.c | |
| parent | push --force-with-lease: implement logic to populate old_sha1_expect[] (diff) | |
| download | tgif-631b5ef219c41027c144218e25075062b91f9471.tar.xz | |
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.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 6027ead5a9..41dc51221c 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"; |