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>

diff --git a/builtin/push.c b/builtin/push.c
index aa9334c9c4341bbdf0a8361c279356941f862782..1e7ac8db33accce66af008459fbcbd8d070eb9f1 100644 (file)
--- 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 flags = 0;
        int tags = 0;
        int rc;

-       int atomic = 0;

        const char *repo = NULL;        /* default repository */
        struct option options[] = {
                OPT__VERBOSITY(&verbosity),
        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_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()
        };
 
                OPT_END()
        };
 


@@ -534,9 +533,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
        if (tags)
                add_refspec("refs/tags/*");
 
        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);
        if (argc > 0) {
                repo = argv[0];
                set_refspecs(argv + 1, argc - 1, repo);