git-merge: add --ff and --no-ff options

[git.git] / builtin-add.c

diff --git a/builtin-add.c b/builtin-add.c
index 105a9f0e1f6aef67f67d985a40a036a4ba833cbe..0d7d0ce4209114245ca07842d7d5a4546e5b6cfd 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -95,14 +95,14 @@ static void update_callback(struct diff_queue_struct *q,
                const char *path = p->one->path;
                switch (p->status) {
                default:
-                       die("unexpacted diff status %c", p->status);
+                       die("unexpected 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:
                        remove_file_from_cache(path);
-                       cache_tree_invalidate_path(active_cache_tree, path);
                        if (verbose)
                                printf("remove '%s'\n", path);
                        break;