aboutsummaryrefslogtreecommitdiff
path: root/send-pack.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-09 14:37:17 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-09 14:37:17 -0800
commit507d6aa5bf2fb9f56d0c7f70d4ff3b8177da9d8e (patch)
treeef1fc1dd06e2e394ebf75652b41ac732c2fdddfb /send-pack.h
parent61c9475221a139245d8c56ae79be25f8ee9c35c2 (diff)
parent04b39f195baf95b79c9c28a096011e9fe0a08303 (diff)
downloadgit-507d6aa5bf2fb9f56d0c7f70d4ff3b8177da9d8e.tar.gz
git-507d6aa5bf2fb9f56d0c7f70d4ff3b8177da9d8e.tar.xz
Merge branch 'sb/atomic-push' into mh/ref-trans-value-check
* sb/atomic-push: Document receive.advertiseatomic t5543-atomic-push.sh: add basic tests for atomic pushes push.c: add an --atomic argument send-pack.c: add --atomic command line argument send-pack: rename ref_update_to_be_sent to check_to_send_update receive-pack.c: negotiate atomic push support receive-pack.c: add execute_commands_atomic function receive-pack.c: move transaction handling in a central place receive-pack.c: move iterating over all commands outside execute_commands receive-pack.c: die instead of error in case of possible future bug receive-pack.c: shorten the execute_commands loop over all commands
Diffstat (limited to 'send-pack.h')
-rw-r--r--send-pack.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/send-pack.h b/send-pack.h
index 563545774..b6646488a 100644
--- a/send-pack.h
+++ b/send-pack.h
@@ -13,7 +13,8 @@ struct send_pack_args {
use_ofs_delta:1,
dry_run:1,
push_cert:1,
- stateless_rpc:1;
+ stateless_rpc:1,
+ atomic:1;
};
int send_pack(struct send_pack_args *args,