builtin-push.c: Cleanup - use OPT_BIT() and remove some variables
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michele Ballabio committed
Jul 20, 2008 at 14:02 UTC
c29c1b406eb6edd30c4a7dc11e91370e497e6a5d
1 file changed
+8
-21
builtin-push.c
+8
-21
@@ -14,7 +14,7 @@ static const char * const push_usage[] = {
14
NULL,
15
};
16
17
-static int thin, verbose;
17
+static int thin;
18
static const char *receivepack;
19
20
static const char **refspec;
@@ -84,7 +84,7 @@ static int do_push(const char *repo, int flags)
84
if (thin)
85
transport_set_option(transport, TRANS_OPT_THIN, "yes");
86
87
- if (verbose)
87
+ if (flags & TRANSPORT_PUSH_VERBOSE)
88
fprintf(stderr, "Pushing to %s\n", remote->url[i]);
89
err = transport_push(transport, refspec_nr, refspec, flags);
90
err |= transport_disconnect(transport);
@@ -101,22 +101,19 @@ static int do_push(const char *repo, int flags)
101
int cmd_push(int argc, const char **argv, const char *prefix)
102
{
103
int flags = 0;
104
- int all = 0;
105
- int mirror = 0;
106
- int dry_run = 0;
107
- int force = 0;
104
int tags = 0;
105
int rc;
106
const char *repo = NULL; /* default repository */
107
108
struct option options[] = {
113
- OPT__VERBOSE(&verbose),
109
+ OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE),
110
OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
115
- OPT_BOOLEAN( 0 , "all", &all, "push all refs"),
116
- OPT_BOOLEAN( 0 , "mirror", &mirror, "mirror all refs"),
111
+ OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
112
+ OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
113
+ (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
114
OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
118
- OPT_BOOLEAN( 0 , "dry-run", &dry_run, "dry run"),
119
- OPT_BOOLEAN('f', "force", &force, "force updates"),
115
+ OPT_BIT( 0 , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
116
+ OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE),
117
OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
118
OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
119
OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
@@ -125,18 +122,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)
122
123
argc = parse_options(argc, argv, options, push_usage, 0);
124
128
- if (force)
129
- flags |= TRANSPORT_PUSH_FORCE;
130
- if (dry_run)
131
- flags |= TRANSPORT_PUSH_DRY_RUN;
132
- if (verbose)
133
- flags |= TRANSPORT_PUSH_VERBOSE;
125
if (tags)
126
add_refspec("refs/tags/*");
136
- if (all)
137
- flags |= TRANSPORT_PUSH_ALL;
138
- if (mirror)
139
- flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
127
128
if (argc > 0) {
129
repo = argv[0];