Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git

diff --git a/builtin/add.c b/builtin/add.c
index df5135bf62acabfa9f68793435c1576ba7c1a36a..4bd98b799e7e1a46beb09249ab2299f4d2b335b8 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -63,7 +63,6 @@ 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)) {