summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-14 07:45:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-14 07:45:29 (GMT)
commit767c98a5929b02152c8904a09f1eabbf8d386395 (patch)
tree8af31e2b8f4f7d868920650748f9c8eeeb3b0519 /builtin-add.c
parentf5de79956b2abeb0f45b338428d39ce089002b66 (diff)
downloadgit-767c98a5929b02152c8904a09f1eabbf8d386395.zip
git-767c98a5929b02152c8904a09f1eabbf8d386395.tar.gz
git-767c98a5929b02152c8904a09f1eabbf8d386395.tar.bz2
git-add -u: do not barf on type changes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-add.c')
-rw-r--r--builtin-add.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-add.c b/builtin-add.c
index 105a9f0..9847b7e 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: