diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-20 11:43:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-20 11:43:25 -0800 |
| commit | cc14ea8cf4520a9607fba4b1fbacea7fa9723c73 (patch) | |
| tree | f5a5fb76eba752964fa48622cbce21f3b796f7f5 /builtin/blame.c | |
| parent | 7a450b48e765e957762b015f30c89f21b1028771 (diff) | |
| parent | 4d552005323034c1d6311796ac1074e9a4b4b57e (diff) | |
| download | git-cc14ea8cf4520a9607fba4b1fbacea7fa9723c73.tar.gz | |
Merge branch 'nd/ita-cleanup'
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 d3fc82c852..55bf5fae9d 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2409,11 +2409,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; |