summaryrefslogtreecommitdiff
path: root/builtin/add.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-25 17:47:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-25 17:47:46 (GMT)
commitb5496cbd2291443b0ad0bf686db51fce6ffad863 (patch)
treef94de64568d0607ed1531920889dca82f877873a /builtin/add.c
parentdf97e5dfeaea093e50afc15e44a23dfd3fa02502 (diff)
parent78cc1a540ba127b13f2f3fd531777b57f3a9cd46 (diff)
downloadgit-b5496cbd2291443b0ad0bf686db51fce6ffad863.zip
git-b5496cbd2291443b0ad0bf686db51fce6ffad863.tar.gz
git-b5496cbd2291443b0ad0bf686db51fce6ffad863.tar.bz2
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 'builtin/add.c')
-rw-r--r--builtin/add.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index df5135b..4bd98b7 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -63,7 +63,6 @@ static void update_callback(struct diff_queue_struct *q,
switch (fix_unmerged_status(p, data)) {
default:
die(_("unexpected diff status %c"), p->status);
- case DIFF_STATUS_ADDED:
case DIFF_STATUS_MODIFIED:
case DIFF_STATUS_TYPE_CHANGED:
if (add_file_to_index(&the_index, path, data->flags)) {