2 * "git add" builtin command
4 * Copyright (C) 2006 Linus Torvalds
10 #include "cache-tree.h"
15 #include "run-command.h"
17 static const char builtin_add_usage
[] =
18 "git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <filepattern>...";
20 static int take_worktree_changes
;
21 static const char *excludes_file
;
23 static void prune_directory(struct dir_struct
*dir
, const char **pathspec
, int prefix
)
27 struct dir_entry
**src
, **dst
;
29 for (specs
= 0; pathspec
[specs
]; specs
++)
31 seen
= xcalloc(specs
, 1);
33 src
= dst
= dir
->entries
;
36 struct dir_entry
*entry
= *src
++;
37 if (match_pathspec(pathspec
, entry
->name
, entry
->len
,
41 dir
->nr
= dst
- dir
->entries
;
43 for (i
= 0; i
< specs
; i
++) {
44 if (!seen
[i
] && !file_exists(pathspec
[i
]))
45 die("pathspec '%s' did not match any files",
50 static void fill_directory(struct dir_struct
*dir
, const char **pathspec
,
53 const char *path
, *base
;
56 /* Set up the default git porcelain excludes */
57 memset(dir
, 0, sizeof(*dir
));
59 dir
->collect_ignored
= 1;
60 dir
->exclude_per_dir
= ".gitignore";
61 path
= git_path("info/exclude");
62 if (!access(path
, R_OK
))
63 add_excludes_from_file(dir
, path
);
64 if (excludes_file
!= NULL
&& !access(excludes_file
, R_OK
))
65 add_excludes_from_file(dir
, excludes_file
);
69 * Calculate common prefix for the pathspec, and
70 * use that to optimize the directory walk
72 baselen
= common_prefix(pathspec
);
76 path
= base
= xmemdupz(*pathspec
, baselen
);
78 /* Read the directory and prune it */
79 read_directory(dir
, path
, base
, baselen
, pathspec
);
81 prune_directory(dir
, pathspec
, baselen
);
84 static void update_callback(struct diff_queue_struct
*q
,
85 struct diff_options
*opt
, void *cbdata
)
89 verbose
= *((int *)cbdata
);
90 for (i
= 0; i
< q
->nr
; i
++) {
91 struct diff_filepair
*p
= q
->queue
[i
];
92 const char *path
= p
->one
->path
;
95 die("unexpected diff status %c", p
->status
);
96 case DIFF_STATUS_UNMERGED
:
97 case DIFF_STATUS_MODIFIED
:
98 case DIFF_STATUS_TYPE_CHANGED
:
99 add_file_to_cache(path
, verbose
);
101 case DIFF_STATUS_DELETED
:
102 remove_file_from_cache(path
);
104 printf("remove '%s'\n", path
);
110 void add_files_to_cache(int verbose
, const char *prefix
, const char **files
)
113 init_revisions(&rev
, prefix
);
114 setup_revisions(0, NULL
, &rev
, NULL
);
115 rev
.prune_data
= get_pathspec(prefix
, files
);
116 rev
.diffopt
.output_format
= DIFF_FORMAT_CALLBACK
;
117 rev
.diffopt
.format_callback
= update_callback
;
118 rev
.diffopt
.format_callback_data
= &verbose
;
119 run_diff_files(&rev
, 0);
122 static void refresh(int verbose
, const char **pathspec
)
127 for (specs
= 0; pathspec
[specs
]; specs
++)
129 seen
= xcalloc(specs
, 1);
130 if (read_cache() < 0)
131 die("index file corrupt");
132 refresh_index(&the_index
, verbose
? 0 : REFRESH_QUIET
, pathspec
, seen
);
133 for (i
= 0; i
< specs
; i
++) {
135 die("pathspec '%s' did not match any files", pathspec
[i
]);
139 static int git_add_config(const char *var
, const char *value
)
141 if (!strcmp(var
, "core.excludesfile")) {
143 die("core.excludesfile without value");
144 excludes_file
= xstrdup(value
);
148 return git_default_config(var
, value
);
151 int interactive_add(void)
153 const char *argv
[2] = { "add--interactive", NULL
};
155 return run_command_v_opt(argv
, RUN_GIT_CMD
);
158 static struct lock_file lock_file
;
160 static const char ignore_error
[] =
161 "The following paths are ignored by one of your .gitignore files:\n";
163 int cmd_add(int argc
, const char **argv
, const char *prefix
)
166 int verbose
= 0, show_only
= 0, ignored_too
= 0, refresh_only
= 0;
167 const char **pathspec
;
168 struct dir_struct dir
;
169 int add_interactive
= 0;
171 for (i
= 1; i
< argc
; i
++) {
172 if (!strcmp("--interactive", argv
[i
]) ||
173 !strcmp("-i", argv
[i
]))
176 if (add_interactive
) {
178 die("add --interactive does not take any parameters");
179 exit(interactive_add());
182 git_config(git_add_config
);
184 newfd
= hold_locked_index(&lock_file
, 1);
186 for (i
= 1; i
< argc
; i
++) {
187 const char *arg
= argv
[i
];
191 if (!strcmp(arg
, "--")) {
195 if (!strcmp(arg
, "-n")) {
199 if (!strcmp(arg
, "-f")) {
203 if (!strcmp(arg
, "-v")) {
207 if (!strcmp(arg
, "-u")) {
208 take_worktree_changes
= 1;
211 if (!strcmp(arg
, "--refresh")) {
215 usage(builtin_add_usage
);
218 if (take_worktree_changes
) {
219 if (read_cache() < 0)
220 die("index file corrupt");
221 add_files_to_cache(verbose
, prefix
, argv
+ i
);
226 fprintf(stderr
, "Nothing specified, nothing added.\n");
227 fprintf(stderr
, "Maybe you wanted to say 'git add .'?\n");
230 pathspec
= get_pathspec(prefix
, argv
+ i
);
233 refresh(verbose
, pathspec
);
237 fill_directory(&dir
, pathspec
, ignored_too
);
240 const char *sep
= "", *eof
= "";
241 for (i
= 0; i
< dir
.nr
; i
++) {
242 printf("%s%s", sep
, dir
.entries
[i
]->name
);
250 if (read_cache() < 0)
251 die("index file corrupt");
253 if (dir
.ignored_nr
) {
254 fprintf(stderr
, ignore_error
);
255 for (i
= 0; i
< dir
.ignored_nr
; i
++) {
256 fprintf(stderr
, "%s\n", dir
.ignored
[i
]->name
);
258 fprintf(stderr
, "Use -f if you really want to add them.\n");
259 die("no files added");
262 for (i
= 0; i
< dir
.nr
; i
++)
263 add_file_to_cache(dir
.entries
[i
]->name
, verbose
);
266 if (active_cache_changed
) {
267 if (write_cache(newfd
, active_cache
, active_nr
) ||
268 close(newfd
) || commit_locked_index(&lock_file
))
269 die("Unable to write new index file");