Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin-push.c: Cleanup - use OPT_BIT() and remove some variables
author
Michele Ballabio
<barra_cuda@katamail.com>
Sun, 20 Jul 2008 12:02:20 +0000
(14:02 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 20 Jul 2008 21:41:49 +0000
(14:41 -0700)
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-push.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
74f5b7f
)
diff --git
a/builtin-push.c
b/builtin-push.c
index 03db28cc3614e83bb141a8d7de190308b3d81331..c1ed68d938f67343c6938cfef54d5ff69a522a63 100644
(file)
--- a/
builtin-push.c
+++ b/
builtin-push.c
@@
-14,7
+14,7
@@
static const char * const push_usage[] = {
NULL,
};
NULL,
};
-static int thin
, verbose
;
+static int thin;
static const char *receivepack;
static const char **refspec;
static const char *receivepack;
static const char **refspec;
@@
-84,7
+84,7
@@
static int do_push(const char *repo, int flags)
if (thin)
transport_set_option(transport, TRANS_OPT_THIN, "yes");
if (thin)
transport_set_option(transport, TRANS_OPT_THIN, "yes");
- if (
verbose
)
+ if (
flags & TRANSPORT_PUSH_VERBOSE
)
fprintf(stderr, "Pushing to %s\n", remote->url[i]);
err = transport_push(transport, refspec_nr, refspec, flags);
err |= transport_disconnect(transport);
fprintf(stderr, "Pushing to %s\n", remote->url[i]);
err = transport_push(transport, refspec_nr, refspec, flags);
err |= transport_disconnect(transport);
@@
-101,22
+101,19
@@
static int do_push(const char *repo, int flags)
int cmd_push(int argc, const char **argv, const char *prefix)
{
int flags = 0;
int cmd_push(int argc, const char **argv, const char *prefix)
{
int flags = 0;
- int all = 0;
- int mirror = 0;
- int dry_run = 0;
- int force = 0;
int tags = 0;
int rc;
const char *repo = NULL; /* default repository */
struct option options[] = {
int tags = 0;
int rc;
const char *repo = NULL; /* default repository */
struct option options[] = {
- OPT_
_VERBOSE(&verbose
),
+ OPT_
BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE
),
OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
- OPT_BOOLEAN( 0 , "all", &all, "push all refs"),
- OPT_BOOLEAN( 0 , "mirror", &mirror, "mirror all refs"),
+ OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
+ OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
+ (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
- OPT_B
OOLEAN( 0 , "dry-run", &dry_run, "dry run"
),
- OPT_B
OOLEAN('f', "force", &force, "force updates"
),
+ OPT_B
IT( 0 , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN
),
+ OPT_B
IT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE
),
OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
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)
argc = parse_options(argc, argv, options, push_usage, 0);
argc = parse_options(argc, argv, options, push_usage, 0);
- if (force)
- flags |= TRANSPORT_PUSH_FORCE;
- if (dry_run)
- flags |= TRANSPORT_PUSH_DRY_RUN;
- if (verbose)
- flags |= TRANSPORT_PUSH_VERBOSE;
if (tags)
add_refspec("refs/tags/*");
if (tags)
add_refspec("refs/tags/*");
- if (all)
- flags |= TRANSPORT_PUSH_ALL;
- if (mirror)
- flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
if (argc > 0) {
repo = argv[0];
if (argc > 0) {
repo = argv[0];