diff --git a/builtin-add.c b/builtin-add.c
index 8ed4a6a9f32b9cd0f71289af2296cacf79864448..87e16aa2200f90e2f12673e856040ed29ee7d119 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
#include "cache-tree.h"
static const char builtin_add_usage[] =
#include "cache-tree.h"
static const char builtin_add_usage[] =
-"git-add [-n] [-v] [-f] [--interactive] [--] <filepattern>...";
+"git-add [-n] [-v] [-f] [--interactive | -i] [--] <filepattern>...";
static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
{
static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
{
i = dir->nr;
while (--i >= 0) {
struct dir_entry *entry = *src++;
i = dir->nr;
while (--i >= 0) {
struct dir_entry *entry = *src++;
- int how = match_pathspec(pathspec, entry->name, entry->len,
- prefix, seen);
- /*
- * ignored entries can be added with exact match,
- * but not with glob nor recursive.
- */
- if (!how ||
- (entry->ignored_entry && how != MATCHED_EXACTLY)) {
- free(entry);
- continue;
- }
- *dst++ = entry;
+ if (match_pathspec(pathspec, entry->name, entry->len,
+ prefix, seen))
+ *dst++ = entry;
}
dir->nr = dst - dir->entries;
}
dir->nr = dst - dir->entries;
@@ -47,10 +38,20 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p
if (seen[i])
continue;
if (seen[i])
continue;
- /* Existing file? We must have ignored it */
match = pathspec[i];
match = pathspec[i];
- if (!match[0] || !lstat(match, &st))
+ if (!match[0])
continue;
continue;
+
+ /* 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;
+ }
die("pathspec '%s' did not match any files", match);
}
}
die("pathspec '%s' did not match any files", match);
}
}
/* Set up the default git porcelain excludes */
memset(dir, 0, sizeof(*dir));
/* Set up the default git porcelain excludes */
memset(dir, 0, sizeof(*dir));
- if (pathspec)
- dir->show_both = 1;
dir->exclude_per_dir = ".gitignore";
path = git_path("info/exclude");
if (!access(path, R_OK))
dir->exclude_per_dir = ".gitignore";
path = git_path("info/exclude");
if (!access(path, R_OK))
int add_interactive = 0;
for (i = 1; i < argc; i++) {
int add_interactive = 0;
for (i = 1; i < argc; i++) {
- if (!strcmp("--interactive", argv[i]))
+ if (!strcmp("--interactive", argv[i]) ||
+ !strcmp("-i", argv[i]))
add_interactive++;
}
if (add_interactive) {
add_interactive++;
}
if (add_interactive) {
if (show_only) {
const char *sep = "", *eof = "";
for (i = 0; i < dir.nr; i++) {
if (show_only) {
const char *sep = "", *eof = "";
for (i = 0; i < dir.nr; i++) {
- if (!ignored_too && dir.entries[i]->ignored_entry)
+ if (!ignored_too && dir.entries[i]->ignored)
continue;
printf("%s%s", sep, dir.entries[i]->name);
sep = " ";
continue;
printf("%s%s", sep, dir.entries[i]->name);
sep = " ";
die("index file corrupt");
if (!ignored_too) {
die("index file corrupt");
if (!ignored_too) {
- int has_ignored = -1;
- for (i = 0; has_ignored < 0 && i < dir.nr; i++)
- if (dir.entries[i]->ignored_entry)
- has_ignored = i;
- if (0 <= has_ignored) {
+ int has_ignored = 0;
+ for (i = 0; i < dir.nr; i++)
+ if (dir.entries[i]->ignored)
+ has_ignored = 1;
+ if (has_ignored) {
fprintf(stderr, ignore_warning);
fprintf(stderr, ignore_warning);
- for (i = has_ignored; i < dir.nr; i++) {
- if (!dir.entries[i]->ignored_entry)
+ for (i = 0; i < dir.nr; i++) {
+ if (!dir.entries[i]->ignored)
continue;
continue;
- fprintf(stderr, "%s\n", dir.entries[i]->name);
+ fprintf(stderr, "%s", dir.entries[i]->name);
+ if (dir.entries[i]->ignored_dir)
+ fprintf(stderr, " (directory)");
+ fputc('\n', stderr);
}
fprintf(stderr,
"Use -f if you really want to add them.\n");
}
fprintf(stderr,
"Use -f if you really want to add them.\n");