Merge branch 'mw/symlinks'

diff --git a/setup.c b/setup.c
index 8295ba6bd85b54089b2d0c564007b25d563877bc..cffb6d605e7893a3f9ff83f427732f6b7f3443ff 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -136,7 +136,7 @@ int check_filename(const char *prefix, const char *arg)
        const char *name;
        struct stat st;
 
-       if (!prefixcmp(arg, ":/")) {
+       if (starts_with(arg, ":/")) {
                if (arg[2] == '\0') /* ":/" is root dir, always exists */
                        return 1;
                name = arg + 2;
@@ -358,7 +358,7 @@ const char *read_gitfile(const char *path)
        if (len != st.st_size)
                die("Error reading %s", path);
        buf[len] = '\0';
-       if (prefixcmp(buf, "gitdir: "))
+       if (!starts_with(buf, "gitdir: "))
                die("Invalid gitfile format: %s", path);
        while (buf[len - 1] == '\n' || buf[len - 1] == '\r')
                len--;