From: Usman Akinyemi <usmanakinyemi202@gmail.com>
Date: Sun, 20 Apr 2025 02:54:33 +0000 (+0530)
Subject: builtin/difftool: remove unnecessary if statement
X-Git-Tag: v2.50.0-rc0~76^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b502a648ef185e7e24ef80097330c44cca510264;p=thirdparty%2Fgit.git

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 <ps@pks.im>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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,