summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-13 06:42:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-13 06:42:42 (GMT)
commita7844827da8273dcf030b9313bc381da3eac011d (patch)
tree81389bdb7fb1f90d5d4388aa6875f56cc3e0008d /builtin/commit.c
parent75f49651a1b947e2eadd2c831b30892c0f4565c8 (diff)
parente859c69b26528a55bd64f4eee2ed06fad999d862 (diff)
downloadgit-a7844827da8273dcf030b9313bc381da3eac011d.zip
git-a7844827da8273dcf030b9313bc381da3eac011d.tar.gz
git-a7844827da8273dcf030b9313bc381da3eac011d.tar.bz2
Merge branch 'nd/cache-tree-api-refactor'
* nd/cache-tree-api-refactor: cache-tree: update API to take abitrary flags
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index eae5a29..3714582 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"));