Junio C Hamano <gits...@pobox.com> writes: >> diff --git a/builtin/commit.c b/builtin/commit.c >> index 9cfef6c..5981755 100644 >> --- a/builtin/commit.c >> +++ b/builtin/commit.c >> @@ -342,6 +342,8 @@ static char *prepare_index(int argc, const char **argv, >> const char *prefix, >> >> discard_cache(); >> read_cache_from(index_lock.filename); >> + if (update_main_cache_tree(WRITE_TREE_SILENT) >= 0) >> + write_cache(fd, active_cache, active_nr); >> >> commit_style = COMMIT_NORMAL; >> return index_lock.filename;
I'll push out a tentative result of merging this series (with some proposed fix-ups) sometime later today, but this part interacts with Duy's split-index topic in a funny way, so I'd exclude it from the merge result for now. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
