The aim of this patch series is to remove the definition '#define USE_THE_REPOSITORY_VARIABLE' from "builtin/fmt-merge-msg.c" by removing global variable 'merge_log_config' and the global 'the_repository' This patch series contains two patches: 1 - Remove the global varaible 'merge_log_config' and add a function 'adjust_shortlog_len()' in fmt-merge-msg.{c,h} to replicate the variable's usage. 2 - Remove the dependency of 'the_repository' in "builtin/fmt-merge-msg.c", allowing the removal of the definition '#define USE_THE_REPOSITORY_VARIABLE'. Also add a test to make sure that "git fmt-merge-msg -h" can be called with repository being NULL. Ayush Chandekar (2): environment: remove the global variable 'merge_log_config' builtin/fmt-merge-msg: stop depending on 'the_repository' builtin/fmt-merge-msg.c | 9 ++++----- builtin/merge.c | 4 ++-- environment.c | 2 -- fmt-merge-msg.c | 30 ++++++++++++++++++++++-------- fmt-merge-msg.h | 3 ++- t/t1517-outside-repo.sh | 7 +++++++ 6 files changed, 37 insertions(+), 18 deletions(-) -- 2.49.0