kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Alex Riesen 2008-05-12 19:58:29 +02:00 committed by Junio C Hamano
parent 7ae02a30e8
commit 984b83ef23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-add.txt
View File

@ -9,7 +9,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git-add' [-n] [-v] [-f] [--interactive | -i] [--patch | -p] [-u] [--refresh] 'git-add' [-n] [-v] [-f] [--interactive | -i] [--patch | -p] [-u] [--refresh]
[--] <filepattern>... [--ignore-errors] [--] <filepattern>...


DESCRIPTION DESCRIPTION
----------- -----------
@ -83,6 +83,11 @@ OPTIONS
Don't add the file(s), but only refresh their stat() Don't add the file(s), but only refresh their stat()
information in the index. information in the index.


\--ignore-errors::
If some files could not be added because of errors indexing
them, do not abort the operation, but continue adding the
others. The command shall still exit with non-zero status.

\--:: \--::
This option can be used to separate command-line options from This option can be used to separate command-line options from
the list of files, (useful when filenames might be mistaken the list of files, (useful when filenames might be mistaken

9
builtin-add.c
View File

@ -191,6 +191,7 @@ static const char ignore_error[] =
"The following paths are ignored by one of your .gitignore files:\n"; "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 verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
static int ignore_add_errors;


static struct option builtin_add_options[] = { static struct option builtin_add_options[] = {
OPT__DRY_RUN(&show_only), 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('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked 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 , "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(), OPT_END(),
}; };


@ -231,6 +233,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)


if (verbose) if (verbose)
flags |= ADD_FILES_VERBOSE; flags |= ADD_FILES_VERBOSE;
if (ignore_add_errors)
flags |= ADD_FILES_IGNORE_ERRORS;


exit_status = add_files_to_cache(prefix, pathspec, flags); exit_status = add_files_to_cache(prefix, pathspec, flags);
goto finish; goto finish;
@ -274,8 +278,11 @@ int cmd_add(int argc, const char **argv, const char *prefix)
} }


for (i = 0; i < dir.nr; i++) for (i = 0; i < dir.nr; i++)
if (add_file_to_cache(dir.entries[i]->name, verbose)) if (add_file_to_cache(dir.entries[i]->name, verbose)) {
if (!ignore_add_errors)
die("adding files failed"); die("adding files failed");
exit_status = 1;
}


finish: finish:
if (active_cache_changed) { if (active_cache_changed) {