From: Junio C Hamano Date: Wed, 13 Aug 2025 22:54:58 +0000 (-0700) Subject: Merge branch 'dk/help-all' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dce87c0b58def92c4b0546c8a87e538af8d4902;p=thirdparty%2Fgit.git Merge branch 'dk/help-all' into next "git cmd --help-all" outside repository. * dk/help-all: builtin: also setup gently for --help-all parse-options: refactor flags for usage_with_options_internal --- 6dce87c0b58def92c4b0546c8a87e538af8d4902 diff --cc t/t1517-outside-repo.sh index 5ce0ceb176,e34321dd44..1c69d52c76 --- a/t/t1517-outside-repo.sh +++ b/t/t1517-outside-repo.sh @@@ -133,13 -133,10 +133,17 @@@ d test_expect_code 129 nongit git $cmd -h >usage && test_grep "[Uu]sage: git $cmd " usage ' + test_$expect_outcome $prereq "'git $cmd --help-all' outside a repository" ' + test_expect_code 129 nongit git $cmd --help-all >usage && + test_grep "[Uu]sage: git $cmd " usage + ' done +test_expect_success 'fmt-merge-msg does not crash with -h' ' + test_expect_code 129 git fmt-merge-msg -h >usage && + test_grep "[Uu]sage: git fmt-merge-msg " usage && + test_expect_code 129 nongit git fmt-merge-msg -h >usage && + test_grep "[Uu]sage: git fmt-merge-msg " usage +' + test_done