From: Thiago Farina <tfransosi@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, jrnieder@gmail.com
Subject: [PATCH v2] builtin/merge_recursive.c: Add an usage string and make use of it.
Date: Sun, 29 Aug 2010 19:20:21 -0300 [thread overview]
Message-ID: <9e0261a0eebe275e2ed1fa651e5ab80c35f6048c.1283120150.git.tfransosi@gmail.com> (raw)
In-Reply-To: <20100829214648.GE1890@burratino>
This improves the usage output by adding builtin_merge_recursive_usage string
that follows the same pattern used by the other builtin commands.
The previous output for git merger-recursive was:
usage: merge-recursive <base>... -- <head> <remote> ...
Now the output is:
usage: git merge-recursive <base>... -- <head> <remote> ...
Signed-off-by: Thiago Farina <tfransosi@gmail.com>
---
builtin/merge-recursive.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index d8875d5..189ba42 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -3,6 +3,9 @@
#include "tag.h"
#include "merge-recursive.h"
+static const char builtin_merge_recursive_usage[] =
+ "git %s <base>... -- <head> <remote> ...";
+
static const char *better_branch_name(const char *branch)
{
static char githead_env[8 + 40 + 1];
@@ -29,7 +32,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
o.subtree_shift = "";
if (argc < 4)
- usagef("%s <base>... -- <head> <remote> ...", argv[0]);
+ usagef(builtin_merge_recursive_usage, argv[0]);
for (i = 1; i < argc; ++i) {
const char *arg = argv[i];
@@ -37,19 +40,19 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
if (!prefixcmp(arg, "--")) {
if (!arg[2])
break;
- if (!strcmp(arg+2, "ours"))
+ if (!strcmp(arg + 2, "ours"))
o.recursive_variant = MERGE_RECURSIVE_OURS;
- else if (!strcmp(arg+2, "theirs"))
+ else if (!strcmp(arg + 2, "theirs"))
o.recursive_variant = MERGE_RECURSIVE_THEIRS;
- else if (!strcmp(arg+2, "subtree"))
+ else if (!strcmp(arg + 2, "subtree"))
o.subtree_shift = "";
- else if (!prefixcmp(arg+2, "subtree="))
+ else if (!prefixcmp(arg + 2, "subtree="))
o.subtree_shift = arg + 10;
else
die("Unknown option %s", arg);
continue;
}
- if (bases_count < ARRAY_SIZE(bases)-1) {
+ if (bases_count < ARRAY_SIZE(bases) - 1) {
unsigned char *sha = xmalloc(20);
if (get_sha1(argv[i], sha))
die("Could not parse object '%s'", argv[i]);
@@ -58,7 +61,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
else
warning("Cannot handle more than %d bases. "
"Ignoring %s.",
- (int)ARRAY_SIZE(bases)-1, argv[i]);
+ (int)ARRAY_SIZE(bases) - 1, argv[i]);
}
if (argc - i != 3) /* "--" "<head>" "<remote>" */
die("Not handling anything other than two heads merge.");
--
1.7.2.1.95.g3d045
next prev parent reply other threads:[~2010-08-29 22:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-29 17:39 [PATCH] builtin/merge_recursive.c: Add a usage string and make use of it Thiago Farina
2010-08-29 21:46 ` Jonathan Nieder
2010-08-29 22:20 ` Thiago Farina [this message]
2010-08-30 2:42 ` [PATCH v2] builtin/merge_recursive.c: Add an " Jonathan Nieder
2010-08-30 3:30 ` [PATCH v3] " Thiago Farina
2010-08-30 6:04 ` Junio C Hamano
2010-08-31 23:42 ` Jonathan Nieder
2010-09-01 2:20 ` Thiago Farina
2010-08-30 3:32 ` [PATCH v2] " Thiago Farina
2010-08-29 22:24 ` [PATCH] builtin/merge_recursive.c: Add a " Thiago Farina
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=9e0261a0eebe275e2ed1fa651e5ab80c35f6048c.1283120150.git.tfransosi@gmail.com \
--to=tfransosi@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).