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