builtin-read-tree.con commit Merge remote branch 'remotes/trast-doc/for-next' (add0951)
   1/*
   2 * GIT - The information manager from hell
   3 *
   4 * Copyright (C) Linus Torvalds, 2005
   5 */
   6
   7#include "cache.h"
   8#include "object.h"
   9#include "tree.h"
  10#include "tree-walk.h"
  11#include "cache-tree.h"
  12#include "unpack-trees.h"
  13#include "dir.h"
  14#include "builtin.h"
  15#include "parse-options.h"
  16#include "resolve-undo.h"
  17
  18static int nr_trees;
  19static struct tree *trees[MAX_UNPACK_TREES];
  20
  21static int list_tree(unsigned char *sha1)
  22{
  23        struct tree *tree;
  24
  25        if (nr_trees >= MAX_UNPACK_TREES)
  26                die("I cannot read more than %d trees", MAX_UNPACK_TREES);
  27        tree = parse_tree_indirect(sha1);
  28        if (!tree)
  29                return -1;
  30        trees[nr_trees++] = tree;
  31        return 0;
  32}
  33
  34static const char * const read_tree_usage[] = {
  35        "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]]",
  36        NULL
  37};
  38
  39static int index_output_cb(const struct option *opt, const char *arg,
  40                                 int unset)
  41{
  42        set_alternate_index_output(arg);
  43        return 0;
  44}
  45
  46static int exclude_per_directory_cb(const struct option *opt, const char *arg,
  47                                    int unset)
  48{
  49        struct dir_struct *dir;
  50        struct unpack_trees_options *opts;
  51
  52        opts = (struct unpack_trees_options *)opt->value;
  53
  54        if (opts->dir)
  55                die("more than one --exclude-per-directory given.");
  56
  57        dir = xcalloc(1, sizeof(*opts->dir));
  58        dir->flags |= DIR_SHOW_IGNORED;
  59        dir->exclude_per_dir = arg;
  60        opts->dir = dir;
  61        /* We do not need to nor want to do read-directory
  62         * here; we are merely interested in reusing the
  63         * per directory ignore stack mechanism.
  64         */
  65        return 0;
  66}
  67
  68static struct lock_file lock_file;
  69
  70int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
  71{
  72        int i, newfd, stage = 0;
  73        unsigned char sha1[20];
  74        struct tree_desc t[MAX_UNPACK_TREES];
  75        struct unpack_trees_options opts;
  76        int prefix_set = 0;
  77        const struct option read_tree_options[] = {
  78                { OPTION_CALLBACK, 0, "index-output", NULL, "FILE",
  79                  "write resulting index to <FILE>",
  80                  PARSE_OPT_NONEG, index_output_cb },
  81                OPT__VERBOSE(&opts.verbose_update),
  82                OPT_GROUP("Merging"),
  83                OPT_SET_INT('m', NULL, &opts.merge,
  84                            "perform a merge in addition to a read", 1),
  85                OPT_SET_INT(0, "trivial", &opts.trivial_merges_only,
  86                            "3-way merge if no file level merging required", 1),
  87                OPT_SET_INT(0, "aggressive", &opts.aggressive,
  88                            "3-way merge in presence of adds and removes", 1),
  89                OPT_SET_INT(0, "reset", &opts.reset,
  90                            "same as -m, but discard unmerged entries", 1),
  91                { OPTION_STRING, 0, "prefix", &opts.prefix, "<subdirectory>/",
  92                  "read the tree into the index under <subdirectory>/",
  93                  PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP },
  94                OPT_SET_INT('u', NULL, &opts.update,
  95                            "update working tree with merge result", 1),
  96                { OPTION_CALLBACK, 0, "exclude-per-directory", &opts,
  97                  "gitignore",
  98                  "allow explicitly ignored files to be overwritten",
  99                  PARSE_OPT_NONEG, exclude_per_directory_cb },
 100                OPT_SET_INT('i', NULL, &opts.index_only,
 101                            "don't check the working tree after merging", 1),
 102                OPT_SET_INT(0, "no-sparse-checkout", &opts.skip_sparse_checkout,
 103                            "skip applying sparse checkout filter", 1),
 104                OPT_END()
 105        };
 106
 107        memset(&opts, 0, sizeof(opts));
 108        opts.head_idx = -1;
 109        opts.src_index = &the_index;
 110        opts.dst_index = &the_index;
 111
 112        git_config(git_default_config, NULL);
 113
 114        argc = parse_options(argc, argv, unused_prefix, read_tree_options,
 115                             read_tree_usage, 0);
 116
 117        newfd = hold_locked_index(&lock_file, 1);
 118
 119        prefix_set = opts.prefix ? 1 : 0;
 120        if (1 < opts.merge + opts.reset + prefix_set)
 121                die("Which one? -m, --reset, or --prefix?");
 122
 123        if (opts.reset || opts.merge || opts.prefix) {
 124                if (read_cache_unmerged() && (opts.prefix || opts.merge))
 125                        die("You need to resolve your current index first");
 126                stage = opts.merge = 1;
 127        }
 128        resolve_undo_clear();
 129
 130        for (i = 0; i < argc; i++) {
 131                const char *arg = argv[i];
 132
 133                if (get_sha1(arg, sha1))
 134                        die("Not a valid object name %s", arg);
 135                if (list_tree(sha1) < 0)
 136                        die("failed to unpack tree object %s", arg);
 137                stage++;
 138        }
 139        if (1 < opts.index_only + opts.update)
 140                die("-u and -i at the same time makes no sense");
 141        if ((opts.update||opts.index_only) && !opts.merge)
 142                die("%s is meaningless without -m, --reset, or --prefix",
 143                    opts.update ? "-u" : "-i");
 144        if ((opts.dir && !opts.update))
 145                die("--exclude-per-directory is meaningless unless -u");
 146        if (opts.merge && !opts.index_only)
 147                setup_work_tree();
 148
 149        if (opts.merge) {
 150                if (stage < 2)
 151                        die("just how do you expect me to merge %d trees?", stage-1);
 152                switch (stage - 1) {
 153                case 1:
 154                        opts.fn = opts.prefix ? bind_merge : oneway_merge;
 155                        break;
 156                case 2:
 157                        opts.fn = twoway_merge;
 158                        opts.initial_checkout = is_cache_unborn();
 159                        break;
 160                case 3:
 161                default:
 162                        opts.fn = threeway_merge;
 163                        break;
 164                }
 165
 166                if (stage - 1 >= 3)
 167                        opts.head_idx = stage - 2;
 168                else
 169                        opts.head_idx = 1;
 170        }
 171
 172        cache_tree_free(&active_cache_tree);
 173        for (i = 0; i < nr_trees; i++) {
 174                struct tree *tree = trees[i];
 175                parse_tree(tree);
 176                init_tree_desc(t+i, tree->buffer, tree->size);
 177        }
 178        if (unpack_trees(nr_trees, t, &opts))
 179                return 128;
 180
 181        /*
 182         * When reading only one tree (either the most basic form,
 183         * "-m ent" or "--reset ent" form), we can obtain a fully
 184         * valid cache-tree because the index must match exactly
 185         * what came from the tree.
 186         *
 187         * The same holds true if we are switching between two trees
 188         * using read-tree -m A B.  The index must match B after that.
 189         */
 190        if (nr_trees == 1 && !opts.prefix)
 191                prime_cache_tree(&active_cache_tree, trees[0]);
 192        else if (nr_trees == 2 && opts.merge)
 193                prime_cache_tree(&active_cache_tree, trees[1]);
 194
 195        if (write_cache(newfd, active_cache, active_nr) ||
 196            commit_locked_index(&lock_file))
 197                die("unable to write new index file");
 198        return 0;
 199}