From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Sep 2007 07:45:29 +0000 (-0700)
Subject: git-add -u: do not barf on type changes
X-Git-Tag: v1.5.3.2~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=767c98a5929b02152c8904a09f1eabbf8d386395;p=git.git

git-add -u: do not barf on type changes

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-add.c b/builtin-add.c
index 105a9f0e1..9847b7e01 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -98,6 +98,7 @@ static void update_callback(struct diff_queue_struct *q,
 			die("unexpacted diff status %c", p->status);
 		case DIFF_STATUS_UNMERGED:
 		case DIFF_STATUS_MODIFIED:
+		case DIFF_STATUS_TYPE_CHANGED:
 			add_file_to_cache(path, verbose);
 			break;
 		case DIFF_STATUS_DELETED: