diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2008-05-12 19:58:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-13 05:54:52 +0200 |
| commit | 7ae02a30e817eda16ea362c6304b6ae28c3a7644 (patch) | |
| tree | 7c9f5faeebe018996079425e9c898f41457ea24c /builtin-checkout.c | |
| parent | Make the exit code of add_file_to_index actually useful (diff) | |
| download | git-7ae02a30e817eda16ea362c6304b6ae28c3a7644.tar.xz git-7ae02a30e817eda16ea362c6304b6ae28c3a7644.zip | |
Extend interface of add_files_to_cache to allow ignore indexing errors
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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); |