diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:10:21 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:10:21 -0800 |
commit | 2bbea5c8f2242ee798e9bee525b485994a8e5911 (patch) | |
tree | 87e64824719bf59565685d3c3db09ea9ce31a248 /builtin/blame.c | |
parent | Merge branch 'pw/completion-stash' into maint (diff) | |
parent | grep: make it clear i-t-a entries are ignored (diff) | |
download | tgif-2bbea5c8f2242ee798e9bee525b485994a8e5911.tar.xz |
Merge branch 'nd/ita-cleanup' into maint
Paths that have been told the index about with "add -N" are not
quite yet in the index, but a few commands behaved as if they
already are in a harmful way.
* nd/ita-cleanup:
grep: make it clear i-t-a entries are ignored
add and use a convenience macro ce_intent_to_add()
blame: remove obsolete comment
Diffstat (limited to 'builtin/blame.c')
-rw-r--r-- | builtin/blame.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 1df13cf7f4..5265f79edc 100644 --- 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; |