From b502a648ef185e7e24ef80097330c44cca510264 Mon Sep 17 00:00:00 2001 From: Usman Akinyemi Date: Sun, 20 Apr 2025 08:24:33 +0530 Subject: [PATCH] builtin/difftool: remove unnecessary if statement Since we already teach the `repo_config()` in "f29f1990b5 (config: teach repo_config to allow `repo` to be NULL, 2025-03-08)" to allow `repo` to be NULL, no need to check if `repo` is NULL before calling `repo_config()`. Suggested-by: Patrick Steinhardt Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi Signed-off-by: Junio C Hamano --- builtin/difftool.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/difftool.c b/builtin/difftool.c index 41cd00066c..c7348a1dca 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -750,8 +750,7 @@ int cmd_difftool(int argc, }; struct child_process child = CHILD_PROCESS_INIT; - if (repo) - repo_config(repo, difftool_config, &dt_options); + repo_config(repo, difftool_config, &dt_options); dt_options.symlinks = dt_options.has_symlinks; argc = parse_options(argc, argv, prefix, builtin_difftool_options, -- 2.52.0