{"thread":{"id":"14545","subject":"[PATCH] builtin-push.c: Cleanup - use OPT_BIT() and remove some variables","startedAt":"2008-07-20T12:02:20Z","lastAt":"2008-07-20T12:02:20Z","messageCount":1,"participants":["Michele Ballabio"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"84022","messageId":"200807201402.20773.barra_cuda@katamail.com","threadId":"14545","inReplyTo":null,"subject":"[PATCH] builtin-push.c: Cleanup - use OPT_BIT() and remove some variables","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2008-07-20T12:02:20Z","receivedAt":"2008-07-20T12:02:20Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n builtin-push.c |   29 ++++++++---------------------\n 1 files changed, 8 insertions(+), 21 deletions(-)\n\ndiff --git a/builtin-push.c b/builtin-push.c\nindex 03db28c..c1ed68d 100644\n--- a/builtin-push.c\n+++ b/builtin-push.c\n@@ -14,7 +14,7 @@ static const char * const push_usage[] = {\n \tNULL,\n };\n \n-static int thin, verbose;\n+static int thin;\n static const char *receivepack;\n \n static const char **refspec;\n@@ -84,7 +84,7 @@ static int do_push(const char *repo, int flags)\n \t\tif (thin)\n \t\t\ttransport_set_option(transport, TRANS_OPT_THIN, \"yes\");\n \n-\t\tif (verbose)\n+\t\tif (flags & TRANSPORT_PUSH_VERBOSE)\n \t\t\tfprintf(stderr, \"Pushing to %s\\n\", remote->url[i]);\n \t\terr = transport_push(transport, refspec_nr, refspec, flags);\n \t\terr |= transport_disconnect(transport);\n@@ -101,22 +101,19 @@ static int do_push(const char *repo, int flags)\n int cmd_push(int argc, const char **argv, const char *prefix)\n {\n \tint flags = 0;\n-\tint all = 0;\n-\tint mirror = 0;\n-\tint dry_run = 0;\n-\tint force = 0;\n \tint tags = 0;\n \tint rc;\n \tconst char *repo = NULL;\t/* default repository */\n \n \tstruct option options[] = {\n-\t\tOPT__VERBOSE(&verbose),\n+\t\tOPT_BIT('v', \"verbose\", &flags, \"be verbose\", TRANSPORT_PUSH_VERBOSE),\n \t\tOPT_STRING( 0 , \"repo\", &repo, \"repository\", \"repository\"),\n-\t\tOPT_BOOLEAN( 0 , \"all\", &all, \"push all refs\"),\n-\t\tOPT_BOOLEAN( 0 , \"mirror\", &mirror, \"mirror all refs\"),\n+\t\tOPT_BIT( 0 , \"all\", &flags, \"push all refs\", TRANSPORT_PUSH_ALL),\n+\t\tOPT_BIT( 0 , \"mirror\", &flags, \"mirror all refs\",\n+\t\t\t    (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),\n \t\tOPT_BOOLEAN( 0 , \"tags\", &tags, \"push tags\"),\n-\t\tOPT_BOOLEAN( 0 , \"dry-run\", &dry_run, \"dry run\"),\n-\t\tOPT_BOOLEAN('f', \"force\", &force, \"force updates\"),\n+\t\tOPT_BIT( 0 , \"dry-run\", &flags, \"dry run\", TRANSPORT_PUSH_DRY_RUN),\n+\t\tOPT_BIT('f', \"force\", &flags, \"force updates\", TRANSPORT_PUSH_FORCE),\n \t\tOPT_BOOLEAN( 0 , \"thin\", &thin, \"use thin pack\"),\n \t\tOPT_STRING( 0 , \"receive-pack\", &receivepack, \"receive-pack\", \"receive pack program\"),\n \t\tOPT_STRING( 0 , \"exec\", &receivepack, \"receive-pack\", \"receive pack program\"),\n@@ -125,18 +122,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)\n \n \targc = parse_options(argc, argv, options, push_usage, 0);\n \n-\tif (force)\n-\t\tflags |= TRANSPORT_PUSH_FORCE;\n-\tif (dry_run)\n-\t\tflags |= TRANSPORT_PUSH_DRY_RUN;\n-\tif (verbose)\n-\t\tflags |= TRANSPORT_PUSH_VERBOSE;\n \tif (tags)\n \t\tadd_refspec(\"refs/tags/*\");\n-\tif (all)\n-\t\tflags |= TRANSPORT_PUSH_ALL;\n-\tif (mirror)\n-\t\tflags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);\n \n \tif (argc > 0) {\n \t\trepo = argv[0];\n-- \n1.5.6.3\n"}]}