builtin-add.c 4.7 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 | -i] [--] <filepattern>...";
L
Linus Torvalds 已提交
14

15 16
static const char *excludes_file;

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

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

L
Linus Torvalds 已提交
27 28 29 30
	src = dst = dir->entries;
	i = dir->nr;
	while (--i >= 0) {
		struct dir_entry *entry = *src++;
J
Junio C Hamano 已提交
31 32 33
		if (match_pathspec(pathspec, entry->name, entry->len,
				   prefix, seen))
			*dst++ = entry;
L
Linus Torvalds 已提交
34 35
	}
	dir->nr = dst - dir->entries;
36 37 38 39 40 41 42 43

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

		match = pathspec[i];
J
Junio C Hamano 已提交
44
		if (!match[0])
45
			continue;
J
Junio C Hamano 已提交
46 47 48 49 50 51 52 53 54 55 56

		/* Existing file? We must have ignored it */
		if (!lstat(match, &st)) {
			struct dir_entry *ent;

			ent = dir_add_name(dir, match, strlen(match));
			ent->ignored = 1;
			if (S_ISDIR(st.st_mode))
				ent->ignored_dir = 1;
			continue;
		}
57 58
		die("pathspec '%s' did not match any files", match);
	}
L
Linus Torvalds 已提交
59 60 61 62 63 64 65 66 67 68 69 70 71
}

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));
	dir->exclude_per_dir = ".gitignore";
	path = git_path("info/exclude");
	if (!access(path, R_OK))
		add_excludes_from_file(dir, path);
72 73
	if (!access(excludes_file, R_OK))
		add_excludes_from_file(dir, excludes_file);
L
Linus Torvalds 已提交
74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94

	/*
	 * 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);
}

95 96 97 98 99 100 101 102 103 104 105 106
static int git_add_config(const char *var, const char *value)
{
	if (!strcmp(var, "core.excludesfile")) {
		if (!value)
			die("core.excludesfile without value");
		excludes_file = xstrdup(value);
		return 0;
	}

	return git_default_config(var, value);
}

107
static struct lock_file lock_file;
L
Linus Torvalds 已提交
108

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

112
int cmd_add(int argc, const char **argv, const char *prefix)
L
Linus Torvalds 已提交
113 114
{
	int i, newfd;
115
	int verbose = 0, show_only = 0, ignored_too = 0;
L
Linus Torvalds 已提交
116 117
	const char **pathspec;
	struct dir_struct dir;
J
Junio C Hamano 已提交
118 119 120
	int add_interactive = 0;

	for (i = 1; i < argc; i++) {
121 122
		if (!strcmp("--interactive", argv[i]) ||
		    !strcmp("-i", argv[i]))
J
Junio C Hamano 已提交
123 124 125 126 127 128 129 130 131 132
			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 已提交
133

134
	git_config(git_add_config);
L
Linus Torvalds 已提交
135

136
	newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
L
Linus Torvalds 已提交
137 138 139 140 141 142 143 144 145 146 147 148 149 150

	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;
		}
151 152 153 154
		if (!strcmp(arg, "-f")) {
			ignored_too = 1;
			continue;
		}
L
Linus Torvalds 已提交
155 156 157 158
		if (!strcmp(arg, "-v")) {
			verbose = 1;
			continue;
		}
159
		usage(builtin_add_usage);
L
Linus Torvalds 已提交
160
	}
161 162 163 164 165
	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 已提交
166 167 168 169 170 171 172
	pathspec = get_pathspec(prefix, argv + i);

	fill_directory(&dir, pathspec);

	if (show_only) {
		const char *sep = "", *eof = "";
		for (i = 0; i < dir.nr; i++) {
J
Junio C Hamano 已提交
173
			if (!ignored_too && dir.entries[i]->ignored)
174
				continue;
L
Linus Torvalds 已提交
175 176 177 178 179 180 181 182
			printf("%s%s", sep, dir.entries[i]->name);
			sep = " ";
			eof = "\n";
		}
		fputs(eof, stdout);
		return 0;
	}

183 184 185
	if (read_cache() < 0)
		die("index file corrupt");

186
	if (!ignored_too) {
J
Junio C Hamano 已提交
187 188 189 190 191
		int has_ignored = 0;
		for (i = 0; i < dir.nr; i++)
			if (dir.entries[i]->ignored)
				has_ignored = 1;
		if (has_ignored) {
192
			fprintf(stderr, ignore_warning);
J
Junio C Hamano 已提交
193 194
			for (i = 0; i < dir.nr; i++) {
				if (!dir.entries[i]->ignored)
195
					continue;
J
Junio C Hamano 已提交
196 197 198 199
				fprintf(stderr, "%s", dir.entries[i]->name);
				if (dir.entries[i]->ignored_dir)
					fprintf(stderr, " (directory)");
				fputc('\n', stderr);
200 201 202 203 204 205 206
			}
			fprintf(stderr,
				"Use -f if you really want to add them.\n");
			exit(1);
		}
	}

L
Linus Torvalds 已提交
207 208 209 210 211
	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) ||
212
		    close(newfd) || commit_lock_file(&lock_file))
L
Linus Torvalds 已提交
213 214 215 216 217
			die("Unable to write new index file");
	}

	return 0;
}