diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-21 14:16:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-21 14:16:46 -0700 |
| commit | 9d880582ee0e63b3865350e90d3576fec55aed20 (patch) | |
| tree | 09edc39b6918dce863c0e88e4c5508a4f957454b /builtin-checkout.c | |
| parent | 8fe114a6e1d606eb806b3f87b17fc22f106af7b7 (diff) | |
| parent | dad25e4a7c34a3ece1355f84b8c4661438754531 (diff) | |
| download | git-9d880582ee0e63b3865350e90d3576fec55aed20.tar.gz | |
Merge branch 'ar/add-unreadable'
* ar/add-unreadable:
Add a config option to ignore errors for git-add
Add a test for git-add --ignore-errors
Add --ignore-errors to git-add to allow it to skip files with read errors
Extend interface of add_files_to_cache to allow ignore indexing errors
Make the exit code of add_file_to_index actually useful
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 10ec137cce..05c06421b6 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -282,7 +282,7 @@ static int merge_working_tree(struct checkout_opts *opts, * entries in the index. */ - add_files_to_cache(0, NULL, NULL); + add_files_to_cache(NULL, NULL, 0); work = write_tree_from_memory(); ret = reset_to_new(new->commit->tree, opts->quiet); |