summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-12-18 15:15:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-18 15:15:18 -0800
commit3517022568b0cbf2ada289e43c8c562b61132082 (patch)
treed71a3432d07de7634b22a965adf0a22a1295641d
parentMerge branch 'jc/strmap-remove-typefix' (diff)
parentstyle: do not "break" in switch() after "return" (diff)
downloadtgif-3517022568b0cbf2ada289e43c8c562b61132082.tar.xz
Merge branch 'ab/unreachable-break'
Code clean-up. * ab/unreachable-break: style: do not "break" in switch() after "return"
-rw-r--r--apply.c2
-rw-r--r--builtin/fast-export.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/apply.c b/apply.c
index 4a4e9a0158..668b16e989 100644
--- a/apply.c
+++ b/apply.c
@@ -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);
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d2e33f5005..0a60356b06 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -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;