aboutsummaryrefslogtreecommitdiffstats
path: root/t/t1517-outside-repo.sh
diff options
context:
space:
mode:
authorAyush Chandekar <ayu.chandekar@gmail.com>2025-08-11 05:15:46 +0530
committerJunio C Hamano <gitster@pobox.com>2025-08-11 09:19:40 -0700
commit22d421fed9cd5757a9da5a97e5b53ded54e93fe9 (patch)
tree68aba5cc02f0c2196c202de2924fd386e80828a0 /t/t1517-outside-repo.sh
parent9a49aef8dcdf899e94cddab14eacc7118c611524 (diff)
downloadgit-22d421fed9cd5757a9da5a97e5b53ded54e93fe9.tar.gz
builtin/fmt-merge-msg: stop depending on 'the_repository'
Refactor builtin/fmt-merge-msg.c to remove the dependancy on the global 'the_repository'. Remove the 'UNUSED' macro from the 'struct repository' parameter and replace 'git_config()' with 'repo_config()' so that configuration is read from the passed repository. Also, add a test to make sure that "git fmt-merge-msg -h" can be called outside a repository. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com> Signed-off-by: Ayush Chandekar <ayu.chandekar@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1517-outside-repo.sh')
-rwxr-xr-xt/t1517-outside-repo.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t1517-outside-repo.sh b/t/t1517-outside-repo.sh
index 6824581317..f6d3206cfe 100755
--- a/t/t1517-outside-repo.sh
+++ b/t/t1517-outside-repo.sh
@@ -114,4 +114,11 @@ test_expect_success 'update-server-info does not crash with -h' '
test_grep "[Uu]sage: git update-server-info " usage
'
+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