summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-02-16 06:12:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-17 18:49:18 (GMT)
commitd16c33b4c11cda583ca2b6f7b81da3ac2fdebfa4 (patch)
treebb1105647794c01776a5876cde7801f97ecc904f /builtin/push.c
parent06038cd7b7646333f15de663b7564cf390dcefbe (diff)
downloadgit-d16c33b4c11cda583ca2b6f7b81da3ac2fdebfa4.zip
git-d16c33b4c11cda583ca2b6f7b81da3ac2fdebfa4.tar.gz
git-d16c33b4c11cda583ca2b6f7b81da3ac2fdebfa4.tar.bz2
cmd_push: set "atomic" bit directly
This makes the code shorter and more obvious by removing an unnecessary interim variable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin/push.c b/builtin/push.c
index aa9334c..1e7ac8d 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -486,7 +486,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
int flags = 0;
int tags = 0;
int rc;
- int atomic = 0;
const char *repo = NULL; /* default repository */
struct option options[] = {
OPT__VERBOSITY(&verbosity),
@@ -518,7 +517,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"),
TRANSPORT_PUSH_FOLLOW_TAGS),
OPT_BIT(0, "signed", &flags, N_("GPG sign the push"), TRANSPORT_PUSH_CERT),
- OPT_BOOL(0, "atomic", &atomic, N_("request atomic transaction on remote side")),
+ OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), TRANSPORT_PUSH_ATOMIC),
OPT_END()
};
@@ -534,9 +533,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
if (tags)
add_refspec("refs/tags/*");
- if (atomic)
- flags |= TRANSPORT_PUSH_ATOMIC;
-
if (argc > 0) {
repo = argv[0];
set_refspecs(argv + 1, argc - 1, repo);