From 767c98a5929b02152c8904a09f1eabbf8d386395 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 14 Sep 2007 00:45:29 -0700 Subject: git-add -u: do not barf on type changes Signed-off-by: Junio C Hamano --- builtin-add.c | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin-add.c') diff --git a/builtin-add.c b/builtin-add.c index 105a9f0e1f..9847b7e019 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: -- cgit v1.2.3