summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-22 21:10:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-22 21:10:21 (GMT)
commit2bbea5c8f2242ee798e9bee525b485994a8e5911 (patch)
tree87e64824719bf59565685d3c3db09ea9ce31a248 /builtin
parent47847c756b7de9615cf89f353d3d2a84f8a871f1 (diff)
parent4d552005323034c1d6311796ac1074e9a4b4b57e (diff)
downloadgit-2bbea5c8f2242ee798e9bee525b485994a8e5911.zip
git-2bbea5c8f2242ee798e9bee525b485994a8e5911.tar.gz
git-2bbea5c8f2242ee798e9bee525b485994a8e5911.tar.bz2
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')
-rw-r--r--builtin/blame.c5
-rw-r--r--builtin/grep.c2
-rw-r--r--builtin/rm.c2
3 files changed, 2 insertions, 7 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 1df13cf..5265f79 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;
diff --git a/builtin/grep.c b/builtin/grep.c
index 4229cae..3ba35ec 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -375,7 +375,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
for (nr = 0; nr < active_nr; nr++) {
const struct cache_entry *ce = active_cache[nr];
- if (!S_ISREG(ce->ce_mode))
+ if (!S_ISREG(ce->ce_mode) || ce_intent_to_add(ce))
continue;
if (!ce_path_match(ce, pathspec, NULL))
continue;
diff --git a/builtin/rm.c b/builtin/rm.c
index 80b972f..8829b09 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -211,7 +211,7 @@ static int check_local_mod(unsigned char *head, int index_only)
* "intent to add" entry.
*/
if (local_changes && staged_changes) {
- if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD))
+ if (!index_only || !ce_intent_to_add(ce))
string_list_append(&files_staged, name);
}
else if (!index_only) {