This improves the usage output by adding builtin_merge_recursive_usage string
that follows the same pattern used by the other builtin commands.
Also it uses usage() function instead of the usagef() function.
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@xxxxxxxxx>
---
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..46c2a85 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 merge-recursive <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]);
+ usage(builtin_merge_recursive_usage);
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html