Merge branch 'dl/branch-error-message'

diff --git a/builtin/add.c b/builtin/add.c
index 3390933d68b2dd6c7296a7d2103d009fa27f2ca8..ee370b059adfd106c70e2c4aa4df50663cb4a8ec 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -63,6 +63,7 @@ static void update_callback(struct diff_queue_struct *q,
                switch (fix_unmerged_status(p, data)) {
                default:
                        die(_("unexpected diff status %c"), p->status);
+               case DIFF_STATUS_ADDED:
                case DIFF_STATUS_MODIFIED:
                case DIFF_STATUS_TYPE_CHANGED:
                        if (add_file_to_index(&the_index, path, data->flags)) {