Browse Source

Merge branch 'ab/unreachable-break'

Code clean-up.

* ab/unreachable-break:
  style: do not "break" in switch() after "return"
maint
Junio C Hamano 4 years ago
parent
commit
3517022568
  1. 2
      apply.c
  2. 1
      builtin/fast-export.c

2
apply.c

@ -3948,10 +3948,8 @@ static int check_patch(struct apply_state *state, struct patch *patch) @@ -3948,10 +3948,8 @@ static int check_patch(struct apply_state *state, struct patch *patch)
break; /* happy */
case EXISTS_IN_INDEX:
return error(_("%s: already exists in index"), new_name);
break;
case EXISTS_IN_INDEX_AS_ITA:
return error(_("%s: does not match index"), new_name);
break;
case EXISTS_IN_WORKTREE:
return error(_("%s: already exists in working directory"),
new_name);

1
builtin/fast-export.c

@ -923,7 +923,6 @@ static struct commit *get_commit(struct rev_cmdline_entry *e, char *full_name) @@ -923,7 +923,6 @@ static struct commit *get_commit(struct rev_cmdline_entry *e, char *full_name)
if (!tag)
die("Tag %s points nowhere?", e->name);
return (struct commit *)tag;
break;
}
default:
return NULL;

Loading…
Cancel
Save