diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-05 17:42:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-05 17:42:31 (GMT) |
| commit | 008028a910b1bb820ad14b976665acf0f5cd4015 (patch) | |
| tree | 1c71dffb14a12743c5e9d01d98b9780e1894e455 /builtin/stash.c | |
| parent | 66775d210960f82ff0d4f69480df51bf44ea718b (diff) | |
| parent | 5fb249021cfd1cf937a608610c330152936887e1 (diff) | |
| download | git-008028a910b1bb820ad14b976665acf0f5cd4015.zip git-008028a910b1bb820ad14b976665acf0f5cd4015.tar.gz git-008028a910b1bb820ad14b976665acf0f5cd4015.tar.bz2 | |
Merge branch 'ab/cat-file'
Assorted updates to "git cat-file", especially "-h".
* ab/cat-file:
cat-file: s/_/-/ in typo'd usage_msg_optf() message
cat-file: don't whitespace-pad "(...)" in SYNOPSIS and usage output
cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
cat-file: correct and improve usage information
cat-file: fix remaining usage bugs
cat-file: make --batch-all-objects a CMDMODE
cat-file: move "usage" variable to cmd_cat_file()
cat-file docs: fix SYNOPSIS and "-h" output
parse-options API: add a usage_msg_optf()
cat-file tests: test messaging on bad objects/paths
cat-file tests: test bad usage
Diffstat (limited to 'builtin/stash.c')
| -rw-r--r-- | builtin/stash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 86cd0b4..9638c56 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -1819,8 +1819,8 @@ int cmd_stash(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[0], "save")) return !!save_stash(argc, argv, prefix); else if (*argv[0] != '-') - usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]), - git_stash_usage, options); + usage_msg_optf(_("unknown subcommand: %s"), + git_stash_usage, options, argv[0]); /* Assume 'stash push' */ strvec_push(&args, "push"); |