From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Aug 2025 21:22:00 +0000 (-0700)
Subject: Merge branch 'dk/help-all'
X-Git-Tag: v2.52.0-rc0~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3c6459ab6610d93da8c95000d0ffc803ce39892;p=thirdparty%2Fgit.git

Merge branch 'dk/help-all'

"git cmd --help-all" now works outside repositories.

* dk/help-all:
  builtin: also setup gently for --help-all
  parse-options: refactor flags for usage_with_options_internal
---

a3c6459ab6610d93da8c95000d0ffc803ce39892
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