diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2008-05-12 17:58:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-13 03:54:52 (GMT) |
| commit | 7ae02a30e817eda16ea362c6304b6ae28c3a7644 (patch) | |
| tree | 7c9f5faeebe018996079425e9c898f41457ea24c /builtin-checkout.c | |
| parent | 960b8ad1b1824b1b82c2b09a000c2119f97633a0 (diff) | |
| download | git-7ae02a30e817eda16ea362c6304b6ae28c3a7644.zip git-7ae02a30e817eda16ea362c6304b6ae28c3a7644.tar.gz git-7ae02a30e817eda16ea362c6304b6ae28c3a7644.tar.bz2 | |
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 10ec137..05c0642 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); |