Skip to content

Commit 767c98a

Browse files
committed
git-add -u: do not barf on type changes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f5de799 commit 767c98a

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

builtin-add.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ static void update_callback(struct diff_queue_struct *q,
9898
die("unexpacted diff status %c", p->status);
9999
case DIFF_STATUS_UNMERGED:
100100
case DIFF_STATUS_MODIFIED:
101+
case DIFF_STATUS_TYPE_CHANGED:
101102
add_file_to_cache(path, verbose);
102103
break;
103104
case DIFF_STATUS_DELETED:

0 commit comments

Comments
 (0)