setup.con commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1#include "cache.h"
   2#include "dir.h"
   3
   4static int inside_git_dir = -1;
   5static int inside_work_tree = -1;
   6
   7const char *prefix_path(const char *prefix, int len, const char *path)
   8{
   9        const char *orig = path;
  10        char *sanitized = xmalloc(len + strlen(path) + 1);
  11        if (is_absolute_path(orig))
  12                strcpy(sanitized, path);
  13        else {
  14                if (len)
  15                        memcpy(sanitized, prefix, len);
  16                strcpy(sanitized + len, path);
  17        }
  18        if (normalize_path_copy(sanitized, sanitized))
  19                goto error_out;
  20        if (is_absolute_path(orig)) {
  21                size_t len, total;
  22                const char *work_tree = get_git_work_tree();
  23                if (!work_tree)
  24                        goto error_out;
  25                len = strlen(work_tree);
  26                total = strlen(sanitized) + 1;
  27                if (strncmp(sanitized, work_tree, len) ||
  28                    (sanitized[len] != '\0' && sanitized[len] != '/')) {
  29                error_out:
  30                        die("'%s' is outside repository", orig);
  31                }
  32                if (sanitized[len] == '/')
  33                        len++;
  34                memmove(sanitized, sanitized + len, total - len);
  35        }
  36        return sanitized;
  37}
  38
  39/*
  40 * Unlike prefix_path, this should be used if the named file does
  41 * not have to interact with index entry; i.e. name of a random file
  42 * on the filesystem.
  43 */
  44const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
  45{
  46        static char path[PATH_MAX];
  47#ifndef WIN32
  48        if (!pfx || !*pfx || is_absolute_path(arg))
  49                return arg;
  50        memcpy(path, pfx, pfx_len);
  51        strcpy(path + pfx_len, arg);
  52#else
  53        char *p;
  54        /* don't add prefix to absolute paths, but still replace '\' by '/' */
  55        if (is_absolute_path(arg))
  56                pfx_len = 0;
  57        else
  58                memcpy(path, pfx, pfx_len);
  59        strcpy(path + pfx_len, arg);
  60        for (p = path + pfx_len; *p; p++)
  61                if (*p == '\\')
  62                        *p = '/';
  63#endif
  64        return path;
  65}
  66
  67int check_filename(const char *prefix, const char *arg)
  68{
  69        const char *name;
  70        struct stat st;
  71
  72        name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
  73        if (!lstat(name, &st))
  74                return 1; /* file exists */
  75        if (errno == ENOENT || errno == ENOTDIR)
  76                return 0; /* file does not exist */
  77        die_errno("failed to stat '%s'", arg);
  78}
  79
  80static void NORETURN die_verify_filename(const char *prefix, const char *arg)
  81{
  82        unsigned char sha1[20];
  83        unsigned mode;
  84        /* try a detailed diagnostic ... */
  85        get_sha1_with_mode_1(arg, sha1, &mode, 0, prefix);
  86        /* ... or fall back the most general message. */
  87        die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
  88            "Use '--' to separate paths from revisions", arg);
  89
  90}
  91
  92/*
  93 * Verify a filename that we got as an argument for a pathspec
  94 * entry. Note that a filename that begins with "-" never verifies
  95 * as true, because even if such a filename were to exist, we want
  96 * it to be preceded by the "--" marker (or we want the user to
  97 * use a format like "./-filename")
  98 */
  99void verify_filename(const char *prefix, const char *arg)
 100{
 101        if (*arg == '-')
 102                die("bad flag '%s' used after filename", arg);
 103        if (check_filename(prefix, arg))
 104                return;
 105        die_verify_filename(prefix, arg);
 106}
 107
 108/*
 109 * Opposite of the above: the command line did not have -- marker
 110 * and we parsed the arg as a refname.  It should not be interpretable
 111 * as a filename.
 112 */
 113void verify_non_filename(const char *prefix, const char *arg)
 114{
 115        if (!is_inside_work_tree() || is_inside_git_dir())
 116                return;
 117        if (*arg == '-')
 118                return; /* flag */
 119        if (!check_filename(prefix, arg))
 120                return;
 121        die("ambiguous argument '%s': both revision and filename\n"
 122            "Use '--' to separate filenames from revisions", arg);
 123}
 124
 125const char **get_pathspec(const char *prefix, const char **pathspec)
 126{
 127        const char *entry = *pathspec;
 128        const char **src, **dst;
 129        int prefixlen;
 130
 131        if (!prefix && !entry)
 132                return NULL;
 133
 134        if (!entry) {
 135                static const char *spec[2];
 136                spec[0] = prefix;
 137                spec[1] = NULL;
 138                return spec;
 139        }
 140
 141        /* Otherwise we have to re-write the entries.. */
 142        src = pathspec;
 143        dst = pathspec;
 144        prefixlen = prefix ? strlen(prefix) : 0;
 145        while (*src) {
 146                const char *p = prefix_path(prefix, prefixlen, *src);
 147                *(dst++) = p;
 148                src++;
 149        }
 150        *dst = NULL;
 151        if (!*pathspec)
 152                return NULL;
 153        return pathspec;
 154}
 155
 156/*
 157 * Test if it looks like we're at a git directory.
 158 * We want to see:
 159 *
 160 *  - either an objects/ directory _or_ the proper
 161 *    GIT_OBJECT_DIRECTORY environment variable
 162 *  - a refs/ directory
 163 *  - either a HEAD symlink or a HEAD file that is formatted as
 164 *    a proper "ref:", or a regular file HEAD that has a properly
 165 *    formatted sha1 object name.
 166 */
 167static int is_git_directory(const char *suspect)
 168{
 169        char path[PATH_MAX];
 170        size_t len = strlen(suspect);
 171
 172        if (PATH_MAX <= len + strlen("/objects"))
 173                die("Too long path: %.*s", 60, suspect);
 174        strcpy(path, suspect);
 175        if (getenv(DB_ENVIRONMENT)) {
 176                if (access(getenv(DB_ENVIRONMENT), X_OK))
 177                        return 0;
 178        }
 179        else {
 180                strcpy(path + len, "/objects");
 181                if (access(path, X_OK))
 182                        return 0;
 183        }
 184
 185        strcpy(path + len, "/refs");
 186        if (access(path, X_OK))
 187                return 0;
 188
 189        strcpy(path + len, "/HEAD");
 190        if (validate_headref(path))
 191                return 0;
 192
 193        return 1;
 194}
 195
 196int is_inside_git_dir(void)
 197{
 198        if (inside_git_dir < 0)
 199                inside_git_dir = is_inside_dir(get_git_dir());
 200        return inside_git_dir;
 201}
 202
 203int is_inside_work_tree(void)
 204{
 205        if (inside_work_tree < 0)
 206                inside_work_tree = is_inside_dir(get_git_work_tree());
 207        return inside_work_tree;
 208}
 209
 210/*
 211 * set_work_tree() is only ever called if you set GIT_DIR explicitly.
 212 * The old behaviour (which we retain here) is to set the work tree root
 213 * to the cwd, unless overridden by the config, the command line, or
 214 * GIT_WORK_TREE.
 215 */
 216static const char *set_work_tree(const char *dir)
 217{
 218        char buffer[PATH_MAX + 1];
 219
 220        if (!getcwd(buffer, sizeof(buffer)))
 221                die ("Could not get the current working directory");
 222        git_work_tree_cfg = xstrdup(buffer);
 223        inside_work_tree = 1;
 224
 225        return NULL;
 226}
 227
 228void setup_work_tree(void)
 229{
 230        const char *work_tree, *git_dir;
 231        static int initialized = 0;
 232
 233        if (initialized)
 234                return;
 235        work_tree = get_git_work_tree();
 236        git_dir = get_git_dir();
 237        if (!is_absolute_path(git_dir))
 238                git_dir = make_absolute_path(git_dir);
 239        if (!work_tree || chdir(work_tree))
 240                die("This operation must be run in a work tree");
 241        set_git_dir(make_relative_path(git_dir, work_tree));
 242        initialized = 1;
 243}
 244
 245static int check_repository_format_gently(int *nongit_ok)
 246{
 247        git_config(check_repository_format_version, NULL);
 248        if (GIT_REPO_VERSION < repository_format_version) {
 249                if (!nongit_ok)
 250                        die ("Expected git repo version <= %d, found %d",
 251                             GIT_REPO_VERSION, repository_format_version);
 252                warning("Expected git repo version <= %d, found %d",
 253                        GIT_REPO_VERSION, repository_format_version);
 254                warning("Please upgrade Git");
 255                *nongit_ok = -1;
 256                return -1;
 257        }
 258        return 0;
 259}
 260
 261/*
 262 * Try to read the location of the git directory from the .git file,
 263 * return path to git directory if found.
 264 */
 265const char *read_gitfile_gently(const char *path)
 266{
 267        char *buf;
 268        char *dir;
 269        const char *slash;
 270        struct stat st;
 271        int fd;
 272        size_t len;
 273
 274        if (stat(path, &st))
 275                return NULL;
 276        if (!S_ISREG(st.st_mode))
 277                return NULL;
 278        fd = open(path, O_RDONLY);
 279        if (fd < 0)
 280                die_errno("Error opening '%s'", path);
 281        buf = xmalloc(st.st_size + 1);
 282        len = read_in_full(fd, buf, st.st_size);
 283        close(fd);
 284        if (len != st.st_size)
 285                die("Error reading %s", path);
 286        buf[len] = '\0';
 287        if (prefixcmp(buf, "gitdir: "))
 288                die("Invalid gitfile format: %s", path);
 289        while (buf[len - 1] == '\n' || buf[len - 1] == '\r')
 290                len--;
 291        if (len < 9)
 292                die("No path in gitfile: %s", path);
 293        buf[len] = '\0';
 294        dir = buf + 8;
 295
 296        if (!is_absolute_path(dir) && (slash = strrchr(path, '/'))) {
 297                size_t pathlen = slash+1 - path;
 298                size_t dirlen = pathlen + len - 8;
 299                dir = xmalloc(dirlen + 1);
 300                strncpy(dir, path, pathlen);
 301                strncpy(dir + pathlen, buf + 8, len - 8);
 302                dir[dirlen] = '\0';
 303                free(buf);
 304                buf = dir;
 305        }
 306
 307        if (!is_git_directory(dir))
 308                die("Not a git repository: %s", dir);
 309        path = make_absolute_path(dir);
 310
 311        free(buf);
 312        return path;
 313}
 314
 315/*
 316 * We cannot decide in this function whether we are in the work tree or
 317 * not, since the config can only be read _after_ this function was called.
 318 */
 319const char *setup_git_directory_gently(int *nongit_ok)
 320{
 321        const char *work_tree_env = getenv(GIT_WORK_TREE_ENVIRONMENT);
 322        const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
 323        static char cwd[PATH_MAX+1];
 324        const char *gitdirenv;
 325        const char *gitfile_dir;
 326        int len, offset, ceil_offset;
 327
 328        /*
 329         * Let's assume that we are in a git repository.
 330         * If it turns out later that we are somewhere else, the value will be
 331         * updated accordingly.
 332         */
 333        if (nongit_ok)
 334                *nongit_ok = 0;
 335
 336        /*
 337         * If GIT_DIR is set explicitly, we're not going
 338         * to do any discovery, but we still do repository
 339         * validation.
 340         */
 341        gitdirenv = getenv(GIT_DIR_ENVIRONMENT);
 342        if (gitdirenv) {
 343                if (PATH_MAX - 40 < strlen(gitdirenv))
 344                        die("'$%s' too big", GIT_DIR_ENVIRONMENT);
 345                if (is_git_directory(gitdirenv)) {
 346                        static char buffer[1024 + 1];
 347                        const char *retval;
 348
 349                        if (!work_tree_env) {
 350                                retval = set_work_tree(gitdirenv);
 351                                /* config may override worktree */
 352                                if (check_repository_format_gently(nongit_ok))
 353                                        return NULL;
 354                                return retval;
 355                        }
 356                        if (check_repository_format_gently(nongit_ok))
 357                                return NULL;
 358                        retval = get_relative_cwd(buffer, sizeof(buffer) - 1,
 359                                        get_git_work_tree());
 360                        if (!retval || !*retval)
 361                                return NULL;
 362                        set_git_dir(make_absolute_path(gitdirenv));
 363                        if (chdir(work_tree_env) < 0)
 364                                die_errno ("Could not chdir to '%s'", work_tree_env);
 365                        strcat(buffer, "/");
 366                        return retval;
 367                }
 368                if (nongit_ok) {
 369                        *nongit_ok = 1;
 370                        return NULL;
 371                }
 372                die("Not a git repository: '%s'", gitdirenv);
 373        }
 374
 375        if (!getcwd(cwd, sizeof(cwd)-1))
 376                die_errno("Unable to read current working directory");
 377
 378        ceil_offset = longest_ancestor_length(cwd, env_ceiling_dirs);
 379        if (ceil_offset < 0 && has_dos_drive_prefix(cwd))
 380                ceil_offset = 1;
 381
 382        /*
 383         * Test in the following order (relative to the cwd):
 384         * - .git (file containing "gitdir: <path>")
 385         * - .git/
 386         * - ./ (bare)
 387         * - ../.git
 388         * - ../.git/
 389         * - ../ (bare)
 390         * - ../../.git/
 391         *   etc.
 392         */
 393        offset = len = strlen(cwd);
 394        for (;;) {
 395                gitfile_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
 396                if (gitfile_dir) {
 397                        if (set_git_dir(gitfile_dir))
 398                                die("Repository setup failed");
 399                        break;
 400                }
 401                if (is_git_directory(DEFAULT_GIT_DIR_ENVIRONMENT))
 402                        break;
 403                if (is_git_directory(".")) {
 404                        inside_git_dir = 1;
 405                        if (!work_tree_env)
 406                                inside_work_tree = 0;
 407                        if (offset != len) {
 408                                cwd[offset] = '\0';
 409                                setenv(GIT_DIR_ENVIRONMENT, cwd, 1);
 410                        } else
 411                                setenv(GIT_DIR_ENVIRONMENT, ".", 1);
 412                        check_repository_format_gently(nongit_ok);
 413                        return NULL;
 414                }
 415                while (--offset > ceil_offset && cwd[offset] != '/');
 416                if (offset <= ceil_offset) {
 417                        if (nongit_ok) {
 418                                if (chdir(cwd))
 419                                        die_errno("Cannot come back to cwd");
 420                                *nongit_ok = 1;
 421                                return NULL;
 422                        }
 423                        die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
 424                }
 425                if (chdir(".."))
 426                        die_errno("Cannot change to '%s/..'", cwd);
 427        }
 428
 429        inside_git_dir = 0;
 430        if (!work_tree_env)
 431                inside_work_tree = 1;
 432        git_work_tree_cfg = xstrndup(cwd, offset);
 433        if (check_repository_format_gently(nongit_ok))
 434                return NULL;
 435        if (offset == len)
 436                return NULL;
 437
 438        /* Make "offset" point to past the '/', and add a '/' at the end */
 439        offset++;
 440        cwd[len++] = '/';
 441        cwd[len] = 0;
 442        return cwd + offset;
 443}
 444
 445int git_config_perm(const char *var, const char *value)
 446{
 447        int i;
 448        char *endptr;
 449
 450        if (value == NULL)
 451                return PERM_GROUP;
 452
 453        if (!strcmp(value, "umask"))
 454                return PERM_UMASK;
 455        if (!strcmp(value, "group"))
 456                return PERM_GROUP;
 457        if (!strcmp(value, "all") ||
 458            !strcmp(value, "world") ||
 459            !strcmp(value, "everybody"))
 460                return PERM_EVERYBODY;
 461
 462        /* Parse octal numbers */
 463        i = strtol(value, &endptr, 8);
 464
 465        /* If not an octal number, maybe true/false? */
 466        if (*endptr != 0)
 467                return git_config_bool(var, value) ? PERM_GROUP : PERM_UMASK;
 468
 469        /*
 470         * Treat values 0, 1 and 2 as compatibility cases, otherwise it is
 471         * a chmod value to restrict to.
 472         */
 473        switch (i) {
 474        case PERM_UMASK:               /* 0 */
 475                return PERM_UMASK;
 476        case OLD_PERM_GROUP:           /* 1 */
 477                return PERM_GROUP;
 478        case OLD_PERM_EVERYBODY:       /* 2 */
 479                return PERM_EVERYBODY;
 480        }
 481
 482        /* A filemode value was given: 0xxx */
 483
 484        if ((i & 0600) != 0600)
 485                die("Problem with core.sharedRepository filemode value "
 486                    "(0%.3o).\nThe owner of files must always have "
 487                    "read and write permissions.", i);
 488
 489        /*
 490         * Mask filemode value. Others can not get write permission.
 491         * x flags for directories are handled separately.
 492         */
 493        return -(i & 0666);
 494}
 495
 496int check_repository_format_version(const char *var, const char *value, void *cb)
 497{
 498        if (strcmp(var, "core.repositoryformatversion") == 0)
 499                repository_format_version = git_config_int(var, value);
 500        else if (strcmp(var, "core.sharedrepository") == 0)
 501                shared_repository = git_config_perm(var, value);
 502        else if (strcmp(var, "core.bare") == 0) {
 503                is_bare_repository_cfg = git_config_bool(var, value);
 504                if (is_bare_repository_cfg == 1)
 505                        inside_work_tree = -1;
 506        } else if (strcmp(var, "core.worktree") == 0) {
 507                if (!value)
 508                        return config_error_nonbool(var);
 509                free(git_work_tree_cfg);
 510                git_work_tree_cfg = xstrdup(value);
 511                inside_work_tree = -1;
 512        }
 513        return 0;
 514}
 515
 516int check_repository_format(void)
 517{
 518        return check_repository_format_gently(NULL);
 519}
 520
 521const char *setup_git_directory(void)
 522{
 523        const char *retval = setup_git_directory_gently(NULL);
 524
 525        /* If the work tree is not the default one, recompute prefix */
 526        if (inside_work_tree < 0) {
 527                static char buffer[PATH_MAX + 1];
 528                char *rel;
 529                if (retval && chdir(retval))
 530                        die_errno ("Could not jump back into original cwd");
 531                rel = get_relative_cwd(buffer, PATH_MAX, get_git_work_tree());
 532                if (rel && *rel && chdir(get_git_work_tree()))
 533                        die_errno ("Could not jump to working directory");
 534                return rel && *rel ? strcat(rel, "/") : NULL;
 535        }
 536
 537        return retval;
 538}