builtin-add.c 4.4 KB
Newer Older
L
Linus Torvalds 已提交
1 2 3 4 5 6 7 8
/*
 * "git add" builtin command
 *
 * Copyright (C) 2006 Linus Torvalds
 */
#include "cache.h"
#include "builtin.h"
#include "dir.h"
J
Junio C Hamano 已提交
9
#include "exec_cmd.h"
10
#include "cache-tree.h"
L
Linus Torvalds 已提交
11 12

static const char builtin_add_usage[] =
13
"git-add [-n] [-v] [-f] [--interactive] [--] <filepattern>...";
L
Linus Torvalds 已提交
14 15 16

static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
{
17 18
	char *seen;
	int i, specs;
L
Linus Torvalds 已提交
19 20
	struct dir_entry **src, **dst;

21 22
	for (specs = 0; pathspec[specs];  specs++)
		/* nothing */;
23
	seen = xcalloc(specs, 1);
24

L
Linus Torvalds 已提交
25 26 27 28
	src = dst = dir->entries;
	i = dir->nr;
	while (--i >= 0) {
		struct dir_entry *entry = *src++;
29 30 31 32 33 34 35 36
		int how = match_pathspec(pathspec, entry->name, entry->len,
					 prefix, seen);
		/*
		 * ignored entries can be added with exact match,
		 * but not with glob nor recursive.
		 */
		if (!how ||
		    (entry->ignored_entry && how != MATCHED_EXACTLY)) {
L
Linus Torvalds 已提交
37 38 39 40 41 42
			free(entry);
			continue;
		}
		*dst++ = entry;
	}
	dir->nr = dst - dir->entries;
43 44 45 46 47 48 49 50 51

	for (i = 0; i < specs; i++) {
		struct stat st;
		const char *match;
		if (seen[i])
			continue;

		/* Existing file? We must have ignored it */
		match = pathspec[i];
52
		if (!match[0] || !lstat(match, &st))
53 54 55
			continue;
		die("pathspec '%s' did not match any files", match);
	}
L
Linus Torvalds 已提交
56 57 58 59 60 61 62 63 64
}

static void fill_directory(struct dir_struct *dir, const char **pathspec)
{
	const char *path, *base;
	int baselen;

	/* Set up the default git porcelain excludes */
	memset(dir, 0, sizeof(*dir));
65 66
	if (pathspec)
		dir->show_both = 1;
L
Linus Torvalds 已提交
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
	dir->exclude_per_dir = ".gitignore";
	path = git_path("info/exclude");
	if (!access(path, R_OK))
		add_excludes_from_file(dir, path);

	/*
	 * Calculate common prefix for the pathspec, and
	 * use that to optimize the directory walk
	 */
	baselen = common_prefix(pathspec);
	path = ".";
	base = "";
	if (baselen) {
		char *common = xmalloc(baselen + 1);
		memcpy(common, *pathspec, baselen);
		common[baselen] = 0;
		path = base = common;
	}

	/* Read the directory and prune it */
	read_directory(dir, path, base, baselen);
	if (pathspec)
		prune_directory(dir, pathspec, baselen);
}

92
static struct lock_file lock_file;
L
Linus Torvalds 已提交
93

94 95 96
static const char ignore_warning[] =
"The following paths are ignored by one of your .gitignore files:\n";

97
int cmd_add(int argc, const char **argv, const char *prefix)
L
Linus Torvalds 已提交
98 99
{
	int i, newfd;
100
	int verbose = 0, show_only = 0, ignored_too = 0;
L
Linus Torvalds 已提交
101 102
	const char **pathspec;
	struct dir_struct dir;
J
Junio C Hamano 已提交
103 104 105 106 107 108 109 110 111 112 113 114 115 116
	int add_interactive = 0;

	for (i = 1; i < argc; i++) {
		if (!strcmp("--interactive", argv[i]))
			add_interactive++;
	}
	if (add_interactive) {
		const char *args[] = { "add--interactive", NULL };

		if (add_interactive != 1 || argc != 2)
			die("add --interactive does not take any parameters");
		execv_git_cmd(args);
		exit(1);
	}
L
Linus Torvalds 已提交
117 118 119

	git_config(git_default_config);

120
	newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
L
Linus Torvalds 已提交
121 122 123 124 125 126 127 128 129 130 131 132 133 134

	for (i = 1; i < argc; i++) {
		const char *arg = argv[i];

		if (arg[0] != '-')
			break;
		if (!strcmp(arg, "--")) {
			i++;
			break;
		}
		if (!strcmp(arg, "-n")) {
			show_only = 1;
			continue;
		}
135 136 137 138
		if (!strcmp(arg, "-f")) {
			ignored_too = 1;
			continue;
		}
L
Linus Torvalds 已提交
139 140 141 142
		if (!strcmp(arg, "-v")) {
			verbose = 1;
			continue;
		}
143
		usage(builtin_add_usage);
L
Linus Torvalds 已提交
144
	}
145 146 147 148 149
	if (argc <= i) {
		fprintf(stderr, "Nothing specified, nothing added.\n");
		fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
		return 0;
	}
L
Linus Torvalds 已提交
150 151 152 153 154 155 156
	pathspec = get_pathspec(prefix, argv + i);

	fill_directory(&dir, pathspec);

	if (show_only) {
		const char *sep = "", *eof = "";
		for (i = 0; i < dir.nr; i++) {
157 158
			if (!ignored_too && dir.entries[i]->ignored_entry)
				continue;
L
Linus Torvalds 已提交
159 160 161 162 163 164 165 166
			printf("%s%s", sep, dir.entries[i]->name);
			sep = " ";
			eof = "\n";
		}
		fputs(eof, stdout);
		return 0;
	}

167 168 169
	if (read_cache() < 0)
		die("index file corrupt");

170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187
	if (!ignored_too) {
		int has_ignored = -1;
		for (i = 0; has_ignored < 0 && i < dir.nr; i++)
			if (dir.entries[i]->ignored_entry)
				has_ignored = i;
		if (0 <= has_ignored) {
			fprintf(stderr, ignore_warning);
			for (i = has_ignored; i < dir.nr; i++) {
				if (!dir.entries[i]->ignored_entry)
					continue;
				fprintf(stderr, "%s\n", dir.entries[i]->name);
			}
			fprintf(stderr,
				"Use -f if you really want to add them.\n");
			exit(1);
		}
	}

L
Linus Torvalds 已提交
188 189 190 191 192
	for (i = 0; i < dir.nr; i++)
		add_file_to_index(dir.entries[i]->name, verbose);

	if (active_cache_changed) {
		if (write_cache(newfd, active_cache, active_nr) ||
193
		    close(newfd) || commit_lock_file(&lock_file))
L
Linus Torvalds 已提交
194 195 196 197 198
			die("Unable to write new index file");
	}

	return 0;
}