aboutsummaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-25 10:47:46 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-25 10:47:46 -0700
commitb5496cbd2291443b0ad0bf686db51fce6ffad863 (patch)
treef94de64568d0607ed1531920889dca82f877873a /diff-lib.c
parentdf97e5dfeaea093e50afc15e44a23dfd3fa02502 (diff)
parent78cc1a540ba127b13f2f3fd531777b57f3a9cd46 (diff)
downloadgit-b5496cbd2291443b0ad0bf686db51fce6ffad863.tar.gz
git-b5496cbd2291443b0ad0bf686db51fce6ffad863.tar.xz
Merge branch 'nd/diff-i-t-a'
* nd/diff-i-t-a: Revert "diff-lib.c: adjust position of i-t-a entries in diff"
Diffstat (limited to 'diff-lib.c')
-rw-r--r--diff-lib.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/diff-lib.c b/diff-lib.c
index 0d8c5358e..241a8435e 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -212,11 +212,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
ce->sha1, !is_null_sha1(ce->sha1),
ce->name, 0);
continue;
- } else if (ce->ce_flags & CE_INTENT_TO_ADD) {
- diff_addremove(&revs->diffopt, '+', ce->ce_mode,
- EMPTY_BLOB_SHA1_BIN, 0,
- ce->name, 0);
- continue;
}
changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
@@ -381,13 +376,6 @@ static void do_oneway_diff(struct unpack_trees_options *o,
struct rev_info *revs = o->unpack_data;
int match_missing, cached;
- /* i-t-a entries do not actually exist in the index */
- if (idx && (idx->ce_flags & CE_INTENT_TO_ADD)) {
- idx = NULL;
- if (!tree)
- return; /* nothing to diff.. */
- }
-
/* if the entry is not checked out, don't examine work tree */
cached = o->index_only ||
(idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));