diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:42 -0800 |
| commit | a7844827da8273dcf030b9313bc381da3eac011d (patch) | |
| tree | 81389bdb7fb1f90d5d4388aa6875f56cc3e0008d /builtin | |
| parent | Merge branch 'fc/zsh-completion' (diff) | |
| parent | cache-tree: update API to take abitrary flags (diff) | |
| download | tgif-a7844827da8273dcf030b9313bc381da3eac011d.tar.xz | |
Merge branch 'nd/cache-tree-api-refactor'
* nd/cache-tree-api-refactor:
cache-tree: update API to take abitrary flags
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index eae5a29aeb..3714582e19 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -400,7 +400,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix, fd = hold_locked_index(&index_lock, 1); add_files_to_cache(also ? prefix : NULL, pathspec, 0); refresh_cache_or_die(refresh_flags); - update_main_cache_tree(1); + update_main_cache_tree(WRITE_TREE_SILENT); if (write_cache(fd, active_cache, active_nr) || close_lock_file(&index_lock)) die(_("unable to write new_index file")); @@ -421,7 +421,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix, fd = hold_locked_index(&index_lock, 1); refresh_cache_or_die(refresh_flags); if (active_cache_changed) { - update_main_cache_tree(1); + update_main_cache_tree(WRITE_TREE_SILENT); if (write_cache(fd, active_cache, active_nr) || commit_locked_index(&index_lock)) die(_("unable to write new_index file")); |