From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Alex Henrie" <alexhenrie24@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Randall S . Becker" <rsbecker@nexbridge.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Denton Liu" <liu.denton@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH 4/7] merge: split cmd_merge()
Date: Wed, 21 Jul 2021 19:08:51 -0500 [thread overview]
Message-ID: <20210722000854.1899129-5-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210722000854.1899129-1-felipe.contreras@gmail.com>
We want to re-use most of cmd_merge() for a new command.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/merge.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 56a526f42c..2770dabf22 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1259,7 +1259,8 @@ static int merging_a_throwaway_tag(struct commit *commit)
return is_throwaway_tag;
}
-int cmd_merge(int argc, const char **argv, const char *prefix)
+static int merge_common(int argc, const char **argv, const char *prefix,
+ const struct option *options, const char * const usage[])
{
struct object_id result_tree, stash, head_oid;
struct commit *head_commit;
@@ -1273,7 +1274,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
int orig_argc = argc;
if (argc == 2 && !strcmp(argv[1], "-h"))
- usage_with_options(builtin_merge_usage, builtin_merge_options);
+ usage_with_options(usage, options);
/*
* Check if we are _not_ on a detached HEAD, i.e. if there is a
@@ -1299,8 +1300,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (branch_mergeoptions)
parse_branch_merge_options(branch_mergeoptions);
- argc = parse_options(argc, argv, prefix, builtin_merge_options,
- builtin_merge_usage, 0);
+ argc = parse_options(argc, argv, prefix, options, usage, 0);
if (shortlog_len < 0)
shortlog_len = (merge_log_config > 0) ? merge_log_config : 0;
@@ -1314,7 +1314,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (orig_argc != 2)
usage_msg_opt(_("--abort expects no arguments"),
- builtin_merge_usage, builtin_merge_options);
+ usage, options);
if (!file_exists(git_path_merge_head(the_repository)))
die(_("There is no merge to abort (MERGE_HEAD missing)."));
@@ -1336,8 +1336,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (quit_current_merge) {
if (orig_argc != 2)
usage_msg_opt(_("--quit expects no arguments"),
- builtin_merge_usage,
- builtin_merge_options);
+ usage, options);
remove_merge_branch_state(the_repository);
goto done;
@@ -1349,7 +1348,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (orig_argc != 2)
usage_msg_opt(_("--continue expects no arguments"),
- builtin_merge_usage, builtin_merge_options);
+ usage, options);
if (!file_exists(git_path_merge_head(the_repository)))
die(_("There is no merge in progress (MERGE_HEAD missing)."));
@@ -1416,8 +1415,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
}
if (!argc)
- usage_with_options(builtin_merge_usage,
- builtin_merge_options);
+ usage_with_options(usage, options);
if (!head_commit) {
/*
@@ -1458,8 +1456,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
argc, argv, &merge_msg);
if (!head_commit || !argc)
- usage_with_options(builtin_merge_usage,
- builtin_merge_options);
+ usage_with_options(usage, options);
if (verify_signatures) {
for (p = remoteheads; p; p = p->next) {
@@ -1740,3 +1737,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
free(branch_to_free);
return ret;
}
+
+int cmd_merge(int argc, const char **argv, const char *prefix)
+{
+ return merge_common(argc, argv, prefix, builtin_merge_options, builtin_merge_usage);
+}
--
2.32.0.40.gb9b36f9b52
next prev parent reply other threads:[~2021-07-22 0:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 0:08 [PATCH 0/7] fast-forward: new command with advice and documentation Felipe Contreras
2021-07-22 0:08 ` [PATCH 1/7] merge: improve fatal fast-forward message Felipe Contreras
2021-07-22 0:08 ` [PATCH 2/7] merge: add diverging advice for novices Felipe Contreras
2021-07-22 0:08 ` [PATCH 3/7] merge: make the diverging advise configurable Felipe Contreras
2021-07-22 0:08 ` Felipe Contreras [this message]
2021-07-22 0:08 ` [PATCH 5/7] fast-forward: add new builtin Felipe Contreras
2021-07-22 0:08 ` [PATCH 6/7] doc: fast-forward: explain what it is Felipe Contreras
2021-07-22 0:08 ` [PATCH 7/7] fast-forward: add help about merge vs. rebase Felipe Contreras
2021-07-22 22:57 ` Philip Oakley
2021-07-23 17:10 ` Felipe Contreras
2021-07-23 19:14 ` Philip Oakley
2021-07-23 20:14 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210722000854.1899129-5-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=rsbecker@nexbridge.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).