kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Ayush Chandekar 2025-08-11 05:15:46 +05:30 committed by Junio C Hamano
parent 9a49aef8dc
commit 22d421fed9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/fmt-merge-msg.c
View File

@ -1,4 +1,3 @@
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h" #include "builtin.h"
#include "config.h" #include "config.h"
#include "fmt-merge-msg.h" #include "fmt-merge-msg.h"
@ -13,7 +12,7 @@ static const char * const fmt_merge_msg_usage[] = {
int cmd_fmt_merge_msg(int argc, int cmd_fmt_merge_msg(int argc,
const char **argv, const char **argv,
const char *prefix, const char *prefix,
struct repository *repo UNUSED) struct repository *repo)
{ {
char *inpath = NULL; char *inpath = NULL;
const char *message = NULL; const char *message = NULL;
@ -54,7 +53,7 @@ int cmd_fmt_merge_msg(int argc,
int ret; int ret;
struct fmt_merge_msg_opts opts; struct fmt_merge_msg_opts opts;


git_config(fmt_merge_msg_config, &merge_log_config); repo_config(repo, fmt_merge_msg_config, &merge_log_config);
argc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage, argc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage,
0); 0);
if (argc > 0) if (argc > 0)

7
t/t1517-outside-repo.sh
View File

@ -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_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 test_done