reset: make the reminder output consistent with "checkout"
[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"
c59cb03a
JS
13#include "diff.h"
14#include "revision.h"
0d781539 15
5c46f754 16static const char * const builtin_add_usage[] = {
1b1dd23f 17 "git add [options] [--] <filepattern>...",
5c46f754
KH
18 NULL
19};
c59cb03a 20static int patch_interactive, add_interactive, edit_interactive;
93c44d49 21static int take_worktree_changes;
896bdfa2 22
1e5f764c
JH
23static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
24{
25 int num_unmatched = 0, i;
26
27 /*
71fe9451 28 * Since we are walking the index as if we were walking the directory,
1e5f764c
JH
29 * we have to mark the matched pathspec as seen; otherwise we will
30 * mistakenly think that the user gave a pathspec that did not match
31 * anything.
32 */
33 for (i = 0; i < specs; i++)
34 if (!seen[i])
35 num_unmatched++;
36 if (!num_unmatched)
37 return;
38 for (i = 0; i < active_nr; i++) {
39 struct cache_entry *ce = active_cache[i];
40 match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen);
41 }
42}
43
0d781539
LT
44static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
45{
f2593398
LT
46 char *seen;
47 int i, specs;
0d781539
LT
48 struct dir_entry **src, **dst;
49
f2593398
LT
50 for (specs = 0; pathspec[specs]; specs++)
51 /* nothing */;
28f75818 52 seen = xcalloc(specs, 1);
f2593398 53
0d781539
LT
54 src = dst = dir->entries;
55 i = dir->nr;
56 while (--i >= 0) {
57 struct dir_entry *entry = *src++;
4d06f8ac
JH
58 if (match_pathspec(pathspec, entry->name, entry->len,
59 prefix, seen))
60 *dst++ = entry;
0d781539
LT
61 }
62 dir->nr = dst - dir->entries;
1e5f764c 63 fill_pathspec_matches(pathspec, seen, specs);
f2593398
LT
64
65 for (i = 0; i < specs; i++) {
07d7bedd 66 if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i]))
e96980ef
JK
67 die("pathspec '%s' did not match any files",
68 pathspec[i]);
f2593398 69 }
399f0a8e 70 free(seen);
0d781539
LT
71}
72
2ce53f9b
JS
73static void treat_gitlinks(const char **pathspec)
74{
75 int i;
76
77 if (!pathspec || !*pathspec)
78 return;
79
80 for (i = 0; i < active_nr; i++) {
81 struct cache_entry *ce = active_cache[i];
82 if (S_ISGITLINK(ce->ce_mode)) {
83 int len = ce_namelen(ce), j;
84 for (j = 0; pathspec[j]; j++) {
85 int len2 = strlen(pathspec[j]);
86 if (len2 <= len || pathspec[j][len] != '/' ||
87 memcmp(ce->name, pathspec[j], len))
88 continue;
89 if (len2 == len + 1)
90 /* strip trailing slash */
91 pathspec[j] = xstrndup(ce->name, len);
92 else
93 die ("Path '%s' is in submodule '%.*s'",
94 pathspec[j], len, ce->name);
95 }
96 }
97 }
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);
43673fdd 108 refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
3deffc52 109 pathspec, seen, "Unstaged changes after refreshing the index:");
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++) {
57199892 124 if (has_symlink_leading_path(*p, strlen(*p))) {
725b0605
JH
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
2af202be 163static int edit_patch(int argc, const char **argv, const char *prefix)
c59cb03a
JS
164{
165 char *file = xstrdup(git_path("ADD_EDIT.patch"));
166 const char *apply_argv[] = { "apply", "--recount", "--cached",
167 file, NULL };
168 struct child_process child;
169 struct rev_info rev;
170 int out;
171 struct stat st;
172
173 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
174
175 if (read_cache() < 0)
176 die ("Could not read the index");
177
178 init_revisions(&rev, prefix);
179 rev.diffopt.context = 7;
180
181 argc = setup_revisions(argc, argv, &rev, NULL);
182 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
183 out = open(file, O_CREAT | O_WRONLY, 0644);
184 if (out < 0)
185 die ("Could not open '%s' for writing.", file);
186 rev.diffopt.file = fdopen(out, "w");
187 rev.diffopt.close_file = 1;
188 if (run_diff_files(&rev, 0))
189 die ("Could not write patch");
190
191 launch_editor(file, NULL, NULL);
192
193 if (stat(file, &st))
0721c314 194 die_errno("Could not stat '%s'", file);
c59cb03a
JS
195 if (!st.st_size)
196 die("Empty patch. Aborted.");
197
198 memset(&child, 0, sizeof(child));
199 child.git_cmd = 1;
200 child.argv = apply_argv;
201 if (run_command(&child))
202 die ("Could not apply '%s'", file);
203
204 unlink(file);
205 return 0;
206}
207
021b6e45 208static struct lock_file lock_file;
0d781539 209
b39c53e6 210static const char ignore_error[] =
6a1ad325
JH
211"The following paths are ignored by one of your .gitignore files:\n";
212
5c46f754 213static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
39425819 214static int ignore_add_errors, addremove, intent_to_add;
5c46f754
KH
215
216static struct option builtin_add_options[] = {
217 OPT__DRY_RUN(&show_only),
218 OPT__VERBOSE(&verbose),
219 OPT_GROUP(""),
220 OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
b63e9950 221 OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
c59cb03a 222 OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
69c61c4f
SG
223 OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"),
224 OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
39425819 225 OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
3ba1f114 226 OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"),
5c46f754 227 OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
984b83ef 228 OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
5c46f754
KH
229 OPT_END(),
230};
231
9bd81e42 232static int add_config(const char *var, const char *value, void *cb)
dad25e4a
AR
233{
234 if (!strcasecmp(var, "add.ignore-errors")) {
235 ignore_add_errors = git_config_bool(var, value);
236 return 0;
237 }
9bd81e42 238 return git_default_config(var, value, cb);
dad25e4a
AR
239}
240
c972ec04
JH
241static int add_files(struct dir_struct *dir, int flags)
242{
243 int i, exit_status = 0;
244
245 if (dir->ignored_nr) {
246 fprintf(stderr, ignore_error);
247 for (i = 0; i < dir->ignored_nr; i++)
248 fprintf(stderr, "%s\n", dir->ignored[i]->name);
249 fprintf(stderr, "Use -f if you really want to add them.\n");
250 die("no files added");
251 }
252
253 for (i = 0; i < dir->nr; i++)
254 if (add_file_to_cache(dir->entries[i]->name, flags)) {
255 if (!ignore_add_errors)
256 die("adding files failed");
257 exit_status = 1;
258 }
259 return exit_status;
260}
261
a633fca0 262int cmd_add(int argc, const char **argv, const char *prefix)
0d781539 263{
7ae02a30 264 int exit_status = 0;
c972ec04 265 int newfd;
0d781539
LT
266 const char **pathspec;
267 struct dir_struct dir;
205ffa94 268 int flags;
c972ec04
JH
269 int add_new_files;
270 int require_pathspec;
5cde71d6 271
ed342fde
SB
272 git_config(add_config, NULL);
273
37782920 274 argc = parse_options(argc, argv, prefix, builtin_add_options,
c59cb03a 275 builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
b63e9950
WC
276 if (patch_interactive)
277 add_interactive = 1;
7c0ab445 278 if (add_interactive)
c59cb03a 279 exit(interactive_add(argc - 1, argv + 1, prefix));
0d781539 280
c59cb03a
JS
281 if (edit_interactive)
282 return(edit_patch(argc, argv, prefix));
283 argc--;
284 argv++;
285
3ba1f114
JH
286 if (addremove && take_worktree_changes)
287 die("-A and -u are mutually incompatible");
1e5f764c 288 if ((addremove || take_worktree_changes) && !argc) {
3ba1f114
JH
289 static const char *here[2] = { ".", NULL };
290 argc = 1;
291 argv = here;
292 }
293
c972ec04
JH
294 add_new_files = !take_worktree_changes && !refresh_only;
295 require_pathspec = !take_worktree_changes;
296
30ca07a2 297 newfd = hold_locked_index(&lock_file, 1);
0d781539 298
205ffa94 299 flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
01665924 300 (show_only ? ADD_CACHE_PRETEND : 0) |
39425819 301 (intent_to_add ? ADD_CACHE_INTENT : 0) |
1e5f764c
JH
302 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
303 (!(addremove || take_worktree_changes)
304 ? ADD_CACHE_IGNORE_REMOVAL : 0));
205ffa94 305
c972ec04 306 if (require_pathspec && argc == 0) {
93b0d86a
JH
307 fprintf(stderr, "Nothing specified, nothing added.\n");
308 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
309 return 0;
310 }
725b0605 311 pathspec = validate_pathspec(argc, argv, prefix);
0d781539 312
366bfcb6
NP
313 if (read_cache() < 0)
314 die("index file corrupt");
2ce53f9b 315 treat_gitlinks(pathspec);
366bfcb6 316
1d8842d9
LT
317 if (add_new_files) {
318 int baselen;
319
320 /* Set up the default git porcelain excludes */
321 memset(&dir, 0, sizeof(dir));
322 if (!ignored_too) {
323 dir.flags |= DIR_COLLECT_IGNORED;
324 setup_standard_excludes(&dir);
325 }
326
1e5f764c 327 /* This picks up the paths that are not tracked */
1d8842d9
LT
328 baselen = fill_directory(&dir, pathspec);
329 if (pathspec)
330 prune_directory(&dir, pathspec, baselen);
331 }
1e5f764c 332
c972ec04
JH
333 if (refresh_only) {
334 refresh(verbose, pathspec);
335 goto finish;
6a1ad325
JH
336 }
337
1e5f764c 338 exit_status |= add_files_to_cache(prefix, pathspec, flags);
c972ec04
JH
339
340 if (add_new_files)
341 exit_status |= add_files(&dir, flags);
0d781539 342
dfdac5d9 343 finish:
0d781539
LT
344 if (active_cache_changed) {
345 if (write_cache(newfd, active_cache, active_nr) ||
4ed7cd3a 346 commit_locked_index(&lock_file))
0d781539
LT
347 die("Unable to write new index file");
348 }
349
7ae02a30 350 return exit_status;
0d781539 351}