From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Matthieu Moy <git@matthieu-moy.fr>,
Michael J Gruber <git@grubix.eu>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 2/7] stage: add helper to run commands
Date: Tue, 10 Aug 2021 23:57:22 -0500 [thread overview]
Message-ID: <20210811045727.2381-3-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210811045727.2381-1-felipe.contreras@gmail.com>
Will be useful to run other commands.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/stage.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/builtin/stage.c b/builtin/stage.c
index 4dcefbedba..49016b0d5f 100644
--- a/builtin/stage.c
+++ b/builtin/stage.c
@@ -4,12 +4,34 @@
#include "builtin.h"
#include "parse-options.h"
+#include "run-command.h"
static const char *const stage_usage[] = {
N_("git stage [options] [--] <paths>..."),
NULL
};
+static int rerun(int argc, const char **argv, ...)
+{
+ int ret;
+ struct strvec args = STRVEC_INIT;
+ va_list ap;
+ const char *arg;
+ int i;
+
+ va_start(ap, argv);
+ while ((arg = va_arg(ap, const char *)))
+ strvec_push(&args, arg);
+ va_end(ap);
+
+ for (i = 0; i < argc; i++)
+ strvec_push(&args, argv[i]);
+
+ ret = run_command_v_opt(args.v, RUN_GIT_CMD);
+ strvec_clear(&args);
+ return ret;
+}
+
int cmd_stage(int argc, const char **argv, const char *prefix)
{
struct option options[] = {
@@ -17,7 +39,7 @@ int cmd_stage(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options, stage_usage,
- PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
+ PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
- return cmd_add(argc, argv, prefix);
+ return rerun(argc, argv, "add", NULL);
}
--
2.32.0.48.g096519100f
next prev parent reply other threads:[~2021-08-11 4:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 4:57 [PATCH 0/7] [un]stage: officially start moving to "staging area" Felipe Contreras
2021-08-11 4:57 ` [PATCH 1/7] stage: add proper 'stage' command Felipe Contreras
2021-08-11 4:57 ` Felipe Contreras [this message]
2021-08-11 4:57 ` [PATCH 3/7] stage: add 'add' subcommand Felipe Contreras
2021-08-11 4:57 ` [PATCH 4/7] stage: add 'remove' subcommand Felipe Contreras
2021-08-11 4:57 ` [PATCH 5/7] unstage: add 'unstage' command Felipe Contreras
2021-08-11 4:57 ` [PATCH 6/7] stage: add 'diff' subcommand Felipe Contreras
2021-08-11 6:12 ` Bagas Sanjaya
2021-08-11 7:24 ` Felipe Contreras
2021-08-11 16:00 ` Junio C Hamano
2021-08-11 17:17 ` Felipe Contreras
2021-08-11 19:06 ` Jeff King
2021-08-11 20:18 ` Felipe Contreras
2021-08-11 20:30 ` Jeff King
2021-08-11 21:24 ` Felipe Contreras
2021-08-11 20:19 ` Michael J Gruber
2021-08-11 20:40 ` Jeff King
2021-08-11 20:51 ` Michael J Gruber
2021-08-11 21:02 ` Jeff King
2021-08-11 20:57 ` Junio C Hamano
2021-08-11 21:40 ` Felipe Contreras
2021-08-11 4:57 ` [PATCH 7/7] stage: add 'edit' command Felipe Contreras
2021-08-11 10:44 ` [PATCH 0/7] [un]stage: officially start moving to "staging area" Michael J Gruber
2021-08-11 16:55 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210811045727.2381-3-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@grubix.eu \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).