Merge branch 'ab/unreachable-break'
Code clean-up. * ab/unreachable-break: style: do not "break" in switch() after "return"
This commit is contained in:
commit
3517022568
2
apply.c
2
apply.c
@ -3948,10 +3948,8 @@ static int check_patch(struct apply_state *state, struct patch *patch)
|
|||||||
break; /* happy */
|
break; /* happy */
|
||||||
case EXISTS_IN_INDEX:
|
case EXISTS_IN_INDEX:
|
||||||
return error(_("%s: already exists in index"), new_name);
|
return error(_("%s: already exists in index"), new_name);
|
||||||
break;
|
|
||||||
case EXISTS_IN_INDEX_AS_ITA:
|
case EXISTS_IN_INDEX_AS_ITA:
|
||||||
return error(_("%s: does not match index"), new_name);
|
return error(_("%s: does not match index"), new_name);
|
||||||
break;
|
|
||||||
case EXISTS_IN_WORKTREE:
|
case EXISTS_IN_WORKTREE:
|
||||||
return error(_("%s: already exists in working directory"),
|
return error(_("%s: already exists in working directory"),
|
||||||
new_name);
|
new_name);
|
||||||
|
@ -923,7 +923,6 @@ static struct commit *get_commit(struct rev_cmdline_entry *e, char *full_name)
|
|||||||
if (!tag)
|
if (!tag)
|
||||||
die("Tag %s points nowhere?", e->name);
|
die("Tag %s points nowhere?", e->name);
|
||||||
return (struct commit *)tag;
|
return (struct commit *)tag;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user