Merge branch 'ab/do-not-limit-stash-help-to-push'

gitster · gitster · commit 8ab404ea0463 · 2022-01-10T11:52:52.000-08:00
"git stash" by default triggers its "push" action, but its
implementation also made "git stash -h" to show short help only for
"git stash push", which has been corrected.

* ab/do-not-limit-stash-help-to-push:
  stash: don't show "git stash push" usage on bad "git stash" usage
diff --git a/builtin/stash.c b/builtin/stash.c
@@ -1683,6 +1683,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
 	if (argc) {
 		force_assume = !strcmp(argv[0], "-p");
 		argc = parse_options(argc, argv, prefix, options,
+				     push_assumed ? git_stash_usage :
 				     git_stash_push_usage,
 				     PARSE_OPT_KEEP_DASHDASH);
 	}
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
@@ -10,6 +10,25 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
+test_expect_success 'usage on cmd and subcommand invalid option' '
+	test_expect_code 129 git stash --invalid-option 2>usage &&
+	grep "or: git stash" usage &&
+
+	test_expect_code 129 git stash push --invalid-option 2>usage &&
+	! grep "or: git stash" usage
+'
+
+test_expect_success 'usage on main command -h emits a summary of subcommands' '
+	test_expect_code 129 git stash -h >usage &&
+	grep -F "usage: git stash list" usage &&
+	grep -F "or: git stash show" usage
+'
+
+test_expect_failure 'usage for subcommands should emit subcommand usage' '
+	test_expect_code 129 git stash push -h >usage &&
+	grep -F "usage: git stash [push" usage
+'
+
 diff_cmp () {
 	for i in "$1" "$2"
 	do

Original file line number	Diff line number	Diff line change
`@@ -1683,6 +1683,7 @@ static int push_stash(int argc, const char *argv, const char prefix,`
`1683`	`1683`	`if (argc) {`
`1684`	`1684`	`force_assume = !strcmp(argv[0], "-p");`
`1685`	`1685`	`argc = parse_options(argc, argv, prefix, options,`
	`1686`	`+ push_assumed ? git_stash_usage :`
`1686`	`1687`	`git_stash_push_usage,`
`1687`	`1688`	`PARSE_OPT_KEEP_DASHDASH);`
`1688`	`1689`	`}`