diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 11:10:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 11:10:14 -0800 |
| commit | 1a507b9cf75bcb2de2391c584539e0ff202549bf (patch) | |
| tree | 50013deffff4af5b2bade8332d1294f1c4ddbcd8 /builtin-check-ref-format.c | |
| parent | 4751f11224600ab25adb0a200fec55a734bc2936 (diff) | |
| parent | f01d74960363736caaf4d98d39555e99bdc72c25 (diff) | |
| download | git-1a507b9cf75bcb2de2391c584539e0ff202549bf.tar.gz git-1a507b9cf75bcb2de2391c584539e0ff202549bf.tar.xz | |
Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere
* jn/maint-http-fetch-mingw:
http-fetch: add missing initialization of argv0_path
merge: do not setup worktree twice
check-ref-format: update usage string
Conflicts:
builtin-check-ref-format.c
Diffstat (limited to 'builtin-check-ref-format.c')
| -rw-r--r-- | builtin-check-ref-format.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c index 0a576afd0..b106c65d8 100644 --- a/builtin-check-ref-format.c +++ b/builtin-check-ref-format.c @@ -7,6 +7,10 @@ #include "builtin.h" #include "strbuf.h" +static const char builtin_check_ref_format_usage[] = +"git check-ref-format [--print] <refname>\n" +" or: git check-ref-format --branch <branchname-shorthand>"; + /* * Replace each run of adjacent slashes in src with a single slash, * and write the result to dst. @@ -52,6 +56,6 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix) exit(0); } if (argc != 2) - usage("git check-ref-format refname"); + usage(builtin_check_ref_format_usage); return !!check_ref_format(argv[1]); } |