diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-22 13:13:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-22 13:13:21 -0700 |
| commit | 9d6e319ec5190a0f5e19d8c7b7a73a4439042df6 (patch) | |
| tree | 9efe5534492c1b54bf6821f3a71afba2410b75ed /builtin/merge.c | |
| parent | 72e4eb56f0a89ed4345ee9f806321cc49b0e7a0d (diff) | |
| parent | 22d421fed9cd5757a9da5a97e5b53ded54e93fe9 (diff) | |
| download | git-9d6e319ec5190a0f5e19d8c7b7a73a4439042df6.tar.gz | |
Merge branch 'ac/deglobal-fmt-merge-log-config'
Code clean-up.
* ac/deglobal-fmt-merge-log-config:
builtin/fmt-merge-msg: stop depending on 'the_repository'
environment: remove the global variable 'merge_log_config'
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index c3810c9cb2..783ca66377 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1374,6 +1374,7 @@ int cmd_merge(int argc, struct commit_list *remoteheads = NULL, *p; void *branch_to_free; int orig_argc = argc; + int merge_log_config = -1; show_usage_with_options_if_asked(argc, argv, builtin_merge_usage, builtin_merge_options); @@ -1392,7 +1393,7 @@ int cmd_merge(int argc, skip_prefix(branch, "refs/heads/", &branch); init_diff_ui_defaults(); - repo_config(the_repository, git_merge_config, NULL); + repo_config(the_repository, git_merge_config, &merge_log_config); if (!branch || is_null_oid(&head_oid)) head_commit = NULL; |