reset.c: replace switch by if-else

The switch statement towards the end of reset.c is missing case arms
for KEEP and MERGE for no obvious reason, and soon the only non-empty
case arm will be the one for HARD. So let's proactively replace it by
if-else, which will let us move one if statement out without leaving
funny-looking left-overs.

Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/reset.c b/builtin/reset.c
index 97fa9f78592b28e741c57d9157a111f13ac99893..c3eb2eb48d5138b1aba7a442ddc08e1ceb4c4b2c 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -349,18 +349,11 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
         * saving the previous head in ORIG_HEAD before. */
        update_ref_status = update_refs(rev, sha1);
 
         * saving the previous head in ORIG_HEAD before. */
        update_ref_status = update_refs(rev, sha1);
 

-       switch (reset_type) {
-       case HARD:
-               if (!update_ref_status && !quiet)
-                       print_new_head_line(commit);
-               break;
-       case SOFT: /* Nothing else to do. */
-               break;
-       case MIXED: /* Report what has not been updated. */
+       if (reset_type == HARD && !update_ref_status && !quiet)
+               print_new_head_line(commit);
+       else if (reset_type == MIXED) /* Report what has not been updated. */

                update_index_refresh(0, NULL,
                                quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
                update_index_refresh(0, NULL,
                                quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);

-               break;
-       }

 
        remove_branch_state();
 
 
        remove_branch_state();