Tidy up git mergetool's backup file behaviour

diff --git a/setup.c b/setup.c
index dc247a84c49709d2bff00440e5ac976df83acd2e..89c81e54e6d25d7ba2bec8831621283f32fd3108 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -448,8 +448,7 @@ int check_repository_format_version(const char *var, const char *value)
        } else if (strcmp(var, "core.worktree") == 0) {
                if (!value)
                        return config_error_nonbool(var);
-               if (git_work_tree_cfg)
-                       free(git_work_tree_cfg);
+               free(git_work_tree_cfg);
                git_work_tree_cfg = xstrdup(value);
                inside_work_tree = -1;
        }