Signed-off-by: Jonas Fonseca <fonseca@xxxxxxx>
---
builtin-branch.c | 1 -
builtin-update-ref.c | 1 -
parse-options.c | 2 +-
3 files changed, 1 insertions(+), 3 deletions(-)
Pierre Habouzit <madcoder@xxxxxxxxxx> wrote Sat, Oct 13, 2007:
> Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx>
> ---
> builtin-update-ref.c | 71 +++++++++++++++++++++-----------------------------
> 1 files changed, 30 insertions(+), 41 deletions(-)
>
> diff --git a/builtin-update-ref.c b/builtin-update-ref.c
> index fe1f74c..eafb642 100644
> --- a/builtin-update-ref.c
> +++ b/builtin-update-ref.c
> @@ -1,59 +1,48 @@
> #include "cache.h"
> #include "refs.h"
> #include "builtin.h"
> +#include "parse-options.h"
>
> -static const char git_update_ref_usage[] =
> -"git-update-ref [-m <reason>] (-d <refname> <value> | [--no-deref] <refname> <value> [<oldval>])";
> +static const char * const git_update_ref_usage[] = {
> + "",
> + "git-update-ref [options] -d <refname> <oldval>",
> + "git-update-ref [options] <refname> <newval> [<oldval>]",
> + NULL
> +};
How about something like this to get rid of these empty strings
that look strange?
> ./git update-ref -h
usage: git-update-ref [options] -d <refname> <oldval>
or: git-update-ref [options] <refname> <newval> [<oldval>]
-m <reason> reason of the update
-d deletes the reference
--no-deref update <refname> not the one it points to
diff --git a/builtin-branch.c b/builtin-branch.c
index fbf983e..d7c4657 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -14,7 +14,6 @@
#include "parse-options.h"
static const char * const builtin_branch_usage[] = {
- "",
"git-branch [options] [-r | -a]",
"git-branch [options] [-l] [-f] <branchname> [<start-point>]",
"git-branch [options] [-r] (-d | -D) <branchname>",
diff --git a/builtin-update-ref.c b/builtin-update-ref.c
index d66d9b5..0cd7817 100644
--- a/builtin-update-ref.c
+++ b/builtin-update-ref.c
@@ -4,7 +4,6 @@
#include "parse-options.h"
static const char * const git_update_ref_usage[] = {
- "",
"git-update-ref [options] -d <refname> <oldval>",
"git-update-ref [options] <refname> <newval> [<oldval>]",
NULL
diff --git a/parse-options.c b/parse-options.c
index c45bb9b..b1d9608 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -181,7 +181,7 @@ void usage_with_options(const char * const *usagestr,
{
fprintf(stderr, "usage: %s\n", *usagestr);
while (*++usagestr)
- fprintf(stderr, " %s\n", *usagestr);
+ fprintf(stderr, " or: %s\n", *usagestr);
if (opts->type != OPTION_GROUP)
fputc('\n', stderr);
--
1.5.3.4.1166.gf076
--
Jonas Fonseca
-
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
