mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd_push: set "atomic" bit directly

Browse Source 
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>
This commit is contained in:
Jeff King
2015-02-16 01:12:04 -05:00
committed by Junio C Hamano
parent 06038cd7b7
commit d16c33b4c1
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/push.c
View File

@ -486,7 +486,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
int flags = 0; int flags = 0;
int tags = 0; int tags = 0;
int rc; int rc;
int atomic = 0;
const char *repo = NULL; /* default repository */ const char *repo = NULL; /* default repository */
struct option options[] = { struct option options[] = {
OPT__VERBOSITY(&verbosity), 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"), OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"),
TRANSPORT_PUSH_FOLLOW_TAGS), TRANSPORT_PUSH_FOLLOW_TAGS),
OPT_BIT(0, "signed", &flags, N_("GPG sign the push"), TRANSPORT_PUSH_CERT), 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() OPT_END()
}; };
@ -534,9 +533,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
if (tags) if (tags)
add_refspec("refs/tags/*"); add_refspec("refs/tags/*");
if (atomic)
flags |= TRANSPORT_PUSH_ATOMIC;
if (argc > 0) { if (argc > 0) {
repo = argv[0]; repo = argv[0];
set_refspecs(argv + 1, argc - 1, repo); set_refspecs(argv + 1, argc - 1, repo);