]> asedeno.scripts.mit.edu Git - git.git/blobdiff - setup.c
Free the path_lists used to find non-local tags in git-fetch
[git.git] / setup.c
diff --git a/setup.c b/setup.c
index bc80301c4239f1f101670cc623badb8bb694bd3d..89c81e54e6d25d7ba2bec8831621283f32fd3108 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -91,7 +91,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
 {
        const char *orig = path;
        char *sanitized = xmalloc(len + strlen(path) + 1);
-       if (*orig == '/')
+       if (is_absolute_path(orig))
                strcpy(sanitized, path);
        else {
                if (len)
@@ -100,7 +100,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
        }
        if (sanitary_path_copy(sanitized, sanitized))
                goto error_out;
-       if (*orig == '/') {
+       if (is_absolute_path(orig)) {
                const char *work_tree = get_git_work_tree();
                size_t len = strlen(work_tree);
                size_t total = strlen(sanitized) + 1;
@@ -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;
        }