summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2008-05-12 19:58:29 +0200
committerJunio C Hamano <gitster@pobox.com>2008-05-12 20:54:52 -0700
commit984b83ef23fdcf6a933f635f182e7bc10130094a (patch)
treec8254da54c8cd1957c441ad58368e5a38a47143e /builtin-add.c
parent7ae02a30e817eda16ea362c6304b6ae28c3a7644 (diff)
downloadgit-984b83ef23fdcf6a933f635f182e7bc10130094a.tar.gz
Add --ignore-errors to git-add to allow it to skip files with read errors
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-add.c')
-rw-r--r--builtin-add.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/builtin-add.c b/builtin-add.c
index 786280818a..522519ec86 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -191,6 +191,7 @@ static const char ignore_error[] =
"The following paths are ignored by one of your .gitignore files:\n";
static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
+static int ignore_add_errors;
static struct option builtin_add_options[] = {
OPT__DRY_RUN(&show_only),
@@ -201,6 +202,7 @@ static struct option builtin_add_options[] = {
OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
+ OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
OPT_END(),
};
@@ -231,6 +233,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (verbose)
flags |= ADD_FILES_VERBOSE;
+ if (ignore_add_errors)
+ flags |= ADD_FILES_IGNORE_ERRORS;
exit_status = add_files_to_cache(prefix, pathspec, flags);
goto finish;
@@ -274,8 +278,11 @@ int cmd_add(int argc, const char **argv, const char *prefix)
}
for (i = 0; i < dir.nr; i++)
- if (add_file_to_cache(dir.entries[i]->name, verbose))
- die("adding files failed");
+ if (add_file_to_cache(dir.entries[i]->name, verbose)) {
+ if (!ignore_add_errors)
+ die("adding files failed");
+ exit_status = 1;
+ }
finish:
if (active_cache_changed) {