Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-add -u: do not barf on type changes
author
Junio C Hamano
<gitster@pobox.com>
Fri, 14 Sep 2007 07:45:29 +0000
(
00:45
-0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 14 Sep 2007 07:45:29 +0000
(
00:45
-0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-add.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
f5de799
)
diff --git
a/builtin-add.c
b/builtin-add.c
index 105a9f0e1f6aef67f67d985a40a036a4ba833cbe..9847b7e019ece82f19e3e5decf8647eb921c4291 100644
(file)
--- 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: