git-add --intent-to-add (-N)
[git/git.git] / builtin-add.c
CommitLineData
0d781539
LT
1/*
2 * "git add" builtin command
3 *
4 * Copyright (C) 2006 Linus Torvalds
5 */
0d781539
LT
6#include "cache.h"
7#include "builtin.h"
8#include "dir.h"
5cde71d6 9#include "exec_cmd.h"
93872e07 10#include "cache-tree.h"
58680165 11#include "run-command.h"
5c46f754 12#include "parse-options.h"
0d781539 13
5c46f754 14static const char * const builtin_add_usage[] = {
1b1dd23f 15 "git add [options] [--] <filepattern>...",
5c46f754
KH
16 NULL
17};
b63e9950 18static int patch_interactive = 0, add_interactive = 0;
93c44d49 19static int take_worktree_changes;
896bdfa2 20
1e5f764c
JH
21static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
22{
23 int num_unmatched = 0, i;
24
25 /*
26 * Since we are walking the index as if we are warlking the directory,
27 * we have to mark the matched pathspec as seen; otherwise we will
28 * mistakenly think that the user gave a pathspec that did not match
29 * anything.
30 */
31 for (i = 0; i < specs; i++)
32 if (!seen[i])
33 num_unmatched++;
34 if (!num_unmatched)
35 return;
36 for (i = 0; i < active_nr; i++) {
37 struct cache_entry *ce = active_cache[i];
38 match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen);
39 }
40}
41
0d781539
LT
42static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
43{
f2593398
LT
44 char *seen;
45 int i, specs;
0d781539
LT
46 struct dir_entry **src, **dst;
47
f2593398
LT
48 for (specs = 0; pathspec[specs]; specs++)
49 /* nothing */;
28f75818 50 seen = xcalloc(specs, 1);
f2593398 51
0d781539
LT
52 src = dst = dir->entries;
53 i = dir->nr;
54 while (--i >= 0) {
55 struct dir_entry *entry = *src++;
4d06f8ac
JH
56 if (match_pathspec(pathspec, entry->name, entry->len,
57 prefix, seen))
58 *dst++ = entry;
0d781539
LT
59 }
60 dir->nr = dst - dir->entries;
1e5f764c 61 fill_pathspec_matches(pathspec, seen, specs);
f2593398
LT
62
63 for (i = 0; i < specs; i++) {
e96980ef
JK
64 if (!seen[i] && !file_exists(pathspec[i]))
65 die("pathspec '%s' did not match any files",
66 pathspec[i]);
f2593398 67 }
399f0a8e 68 free(seen);
0d781539
LT
69}
70
e96980ef
JK
71static void fill_directory(struct dir_struct *dir, const char **pathspec,
72 int ignored_too)
0d781539
LT
73{
74 const char *path, *base;
75 int baselen;
76
77 /* Set up the default git porcelain excludes */
78 memset(dir, 0, sizeof(*dir));
e96980ef
JK
79 if (!ignored_too) {
80 dir->collect_ignored = 1;
039bc64e 81 setup_standard_excludes(dir);
e96980ef 82 }
0d781539
LT
83
84 /*
85 * Calculate common prefix for the pathspec, and
86 * use that to optimize the directory walk
87 */
88 baselen = common_prefix(pathspec);
89 path = ".";
90 base = "";
182af834
PH
91 if (baselen)
92 path = base = xmemdupz(*pathspec, baselen);
0d781539
LT
93
94 /* Read the directory and prune it */
9fc42d60 95 read_directory(dir, path, base, baselen, pathspec);
0d781539
LT
96 if (pathspec)
97 prune_directory(dir, pathspec, baselen);
98}
99
d616813d
AJ
100static void refresh(int verbose, const char **pathspec)
101{
102 char *seen;
103 int i, specs;
104
105 for (specs = 0; pathspec[specs]; specs++)
106 /* nothing */;
107 seen = xcalloc(specs, 1);
d14e7407
JH
108 refresh_index(&the_index, verbose ? REFRESH_SAY_CHANGED : REFRESH_QUIET,
109 pathspec, seen);
d616813d
AJ
110 for (i = 0; i < specs; i++) {
111 if (!seen[i])
112 die("pathspec '%s' did not match any files", pathspec[i]);
113 }
399f0a8e 114 free(seen);
d616813d
AJ
115}
116
3f061887
JH
117static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
118{
119 const char **pathspec = get_pathspec(prefix, argv);
120
725b0605
JH
121 if (pathspec) {
122 const char **p;
123 for (p = pathspec; *p; p++) {
124 if (has_symlink_leading_path(strlen(*p), *p)) {
125 int len = prefix ? strlen(prefix) : 0;
126 die("'%s' is beyond a symbolic link", *p + len);
127 }
128 }
129 }
130
3f061887
JH
131 return pathspec;
132}
133
134int interactive_add(int argc, const char **argv, const char *prefix)
58680165 135{
b63e9950 136 int status, ac;
3f061887
JH
137 const char **args;
138 const char **pathspec = NULL;
139
140 if (argc) {
141 pathspec = validate_pathspec(argc, argv, prefix);
142 if (!pathspec)
143 return -1;
144 }
324ccbd6 145
b63e9950
WC
146 args = xcalloc(sizeof(const char *), (argc + 4));
147 ac = 0;
148 args[ac++] = "add--interactive";
149 if (patch_interactive)
150 args[ac++] = "--patch";
151 args[ac++] = "--";
152 if (argc) {
153 memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc);
154 ac += argc;
155 }
156 args[ac] = NULL;
7c0ab445
WC
157
158 status = run_command_v_opt(args, RUN_GIT_CMD);
159 free(args);
160 return status;
58680165
KH
161}
162
021b6e45 163static struct lock_file lock_file;
0d781539 164
b39c53e6 165static const char ignore_error[] =
6a1ad325
JH
166"The following paths are ignored by one of your .gitignore files:\n";
167
5c46f754 168static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
39425819 169static int ignore_add_errors, addremove, intent_to_add;
5c46f754
KH
170
171static struct option builtin_add_options[] = {
172 OPT__DRY_RUN(&show_only),
173 OPT__VERBOSE(&verbose),
174 OPT_GROUP(""),
175 OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
b63e9950 176 OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
69c61c4f
SG
177 OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"),
178 OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
39425819 179 OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
3ba1f114 180 OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"),
5c46f754 181 OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
984b83ef 182 OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
5c46f754
KH
183 OPT_END(),
184};
185
9bd81e42 186static int add_config(const char *var, const char *value, void *cb)
dad25e4a
AR
187{
188 if (!strcasecmp(var, "add.ignore-errors")) {
189 ignore_add_errors = git_config_bool(var, value);
190 return 0;
191 }
9bd81e42 192 return git_default_config(var, value, cb);
dad25e4a
AR
193}
194
c972ec04
JH
195static int add_files(struct dir_struct *dir, int flags)
196{
197 int i, exit_status = 0;
198
199 if (dir->ignored_nr) {
200 fprintf(stderr, ignore_error);
201 for (i = 0; i < dir->ignored_nr; i++)
202 fprintf(stderr, "%s\n", dir->ignored[i]->name);
203 fprintf(stderr, "Use -f if you really want to add them.\n");
204 die("no files added");
205 }
206
207 for (i = 0; i < dir->nr; i++)
208 if (add_file_to_cache(dir->entries[i]->name, flags)) {
209 if (!ignore_add_errors)
210 die("adding files failed");
211 exit_status = 1;
212 }
213 return exit_status;
214}
215
a633fca0 216int cmd_add(int argc, const char **argv, const char *prefix)
0d781539 217{
7ae02a30 218 int exit_status = 0;
c972ec04 219 int newfd;
0d781539
LT
220 const char **pathspec;
221 struct dir_struct dir;
205ffa94 222 int flags;
c972ec04
JH
223 int add_new_files;
224 int require_pathspec;
5cde71d6 225
5c46f754
KH
226 argc = parse_options(argc, argv, builtin_add_options,
227 builtin_add_usage, 0);
b63e9950
WC
228 if (patch_interactive)
229 add_interactive = 1;
7c0ab445 230 if (add_interactive)
3f061887 231 exit(interactive_add(argc, argv, prefix));
0d781539 232
9bd81e42 233 git_config(add_config, NULL);
0d781539 234
3ba1f114
JH
235 if (addremove && take_worktree_changes)
236 die("-A and -u are mutually incompatible");
1e5f764c 237 if ((addremove || take_worktree_changes) && !argc) {
3ba1f114
JH
238 static const char *here[2] = { ".", NULL };
239 argc = 1;
240 argv = here;
241 }
242
c972ec04
JH
243 add_new_files = !take_worktree_changes && !refresh_only;
244 require_pathspec = !take_worktree_changes;
245
30ca07a2 246 newfd = hold_locked_index(&lock_file, 1);
0d781539 247
205ffa94 248 flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
01665924 249 (show_only ? ADD_CACHE_PRETEND : 0) |
39425819 250 (intent_to_add ? ADD_CACHE_INTENT : 0) |
1e5f764c
JH
251 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
252 (!(addremove || take_worktree_changes)
253 ? ADD_CACHE_IGNORE_REMOVAL : 0));
205ffa94 254
c972ec04 255 if (require_pathspec && argc == 0) {
93b0d86a
JH
256 fprintf(stderr, "Nothing specified, nothing added.\n");
257 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
258 return 0;
259 }
725b0605 260 pathspec = validate_pathspec(argc, argv, prefix);
0d781539 261
366bfcb6
NP
262 if (read_cache() < 0)
263 die("index file corrupt");
264
1e5f764c
JH
265 if (add_new_files)
266 /* This picks up the paths that are not tracked */
267 fill_directory(&dir, pathspec, ignored_too);
268
c972ec04
JH
269 if (refresh_only) {
270 refresh(verbose, pathspec);
271 goto finish;
6a1ad325
JH
272 }
273
1e5f764c 274 exit_status |= add_files_to_cache(prefix, pathspec, flags);
c972ec04
JH
275
276 if (add_new_files)
277 exit_status |= add_files(&dir, flags);
0d781539 278
dfdac5d9 279 finish:
0d781539
LT
280 if (active_cache_changed) {
281 if (write_cache(newfd, active_cache, active_nr) ||
4ed7cd3a 282 commit_locked_index(&lock_file))
0d781539
LT
283 die("Unable to write new index file");
284 }
285
7ae02a30 286 return exit_status;
0d781539 287}