]> git.ipfire.org Git - thirdparty/git.git/commitdiff
builtin/difftool: remove unnecessary if statement
authorUsman Akinyemi <usmanakinyemi202@gmail.com>
Sun, 20 Apr 2025 02:54:33 +0000 (08:24 +0530)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Apr 2025 21:17:22 +0000 (14:17 -0700)
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>
builtin/difftool.c

index 41cd00066cc58a89d5a6d2250addc2d4d4a73799..c7348a1dcadb63a89a33f1af04ed72c31819c282 100644 (file)
@@ -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,