[PATCH 1/3] cmd_push: set "atomic" bit directly

[Jeff King]

This makes the code shorter and more obvious by removing an
unnecessary interim variable.

Signed-off-by: Jeff King <p...@peff.net>
---
 builtin/push.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/builtin/push.c b/builtin/push.c
index ab99f4c..f558c2e 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -519,7 +519,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),
@@ -551,7 +550,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()
        };
 
@@ -567,9 +566,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);
-- 
2.3.0.rc1.287.g761fd19

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html