builtin-add.c 3.0 KB
Newer Older
L
Linus Torvalds 已提交
1 2 3 4 5 6 7 8 9 10
/*
 * "git add" builtin command
 *
 * Copyright (C) 2006 Linus Torvalds
 */
#include <fnmatch.h>

#include "cache.h"
#include "builtin.h"
#include "dir.h"
11
#include "cache-tree.h"
L
Linus Torvalds 已提交
12 13 14 15 16 17

static const char builtin_add_usage[] =
"git-add [-n] [-v] <filepattern>...";

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

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

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

	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];
46
		if (!match[0] || !lstat(match, &st))
47 48 49
			continue;
		die("pathspec '%s' did not match any files", match);
	}
L
Linus Torvalds 已提交
50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
}

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);

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

85
static struct lock_file lock_file;
L
Linus Torvalds 已提交
86

87
int cmd_add(int argc, const char **argv, const char *prefix)
L
Linus Torvalds 已提交
88 89 90 91 92 93 94 95
{
	int i, newfd;
	int verbose = 0, show_only = 0;
	const char **pathspec;
	struct dir_struct dir;

	git_config(git_default_config);

96
	newfd = hold_lock_file_for_update(&lock_file, get_index_file());
L
Linus Torvalds 已提交
97
	if (newfd < 0)
98
		die("unable to create new index file");
L
Linus Torvalds 已提交
99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141

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

	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;
		}
		if (!strcmp(arg, "-v")) {
			verbose = 1;
			continue;
		}
		die(builtin_add_usage);
	}
	pathspec = get_pathspec(prefix, argv + i);

	fill_directory(&dir, pathspec);

	if (show_only) {
		const char *sep = "", *eof = "";
		for (i = 0; i < dir.nr; i++) {
			printf("%s%s", sep, dir.entries[i]->name);
			sep = " ";
			eof = "\n";
		}
		fputs(eof, stdout);
		return 0;
	}

	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) ||
142
		    close(newfd) || commit_lock_file(&lock_file))
L
Linus Torvalds 已提交
143 144 145 146 147
			die("Unable to write new index file");
	}

	return 0;
}