Merge branch 'ps/config-error' into maint

diff --git a/builtin/blame.c b/builtin/blame.c
index 1df13cf7f4b501ed82dcbffdf4620706591a245e..5265f79edc907de356dea2ece4d1645210b7aad4 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2392,11 +2392,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
        ce->ce_mode = create_ce_mode(mode);
        add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
 
-       /*
-        * We are not going to write this out, so this does not matter
-        * right now, but someday we might optimize diff-index --cached
-        * with cache-tree information.
-        */
        cache_tree_invalidate_path(&the_index, path);
 
        return commit;