fmt-merge-msg: use skip_prefix() instead of starts_with()
Get rid of two magic numbers by using skip_prefix(). Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Nov 26, 2019 at 15:22 UTC
7e412e8a3492bc60604060f4f1b1d4ddeda7071f
1 file changed
+4
-5
builtin/fmt-merge-msg.c
+4
-5
@@ -106,7 +106,7 @@ static int handle_line(char *line, struct merge_parents *merge_parents)
106
int i, len = strlen(line);
107
struct origin_data *origin_data;
108
char *src;
109
- const char *origin;
109
+ const char *origin, *tag_name;
110
struct src_data *src_data;
111
struct string_list_item *item;
112
int pulling_head = 0;
@@ -162,14 +162,13 @@ static int handle_line(char *line, struct merge_parents *merge_parents)
162
if (pulling_head) {
163
origin = src;
164
src_data->head_status |= 1;
165
- } else if (starts_with(line, "branch ")) {
165
+ } else if (skip_prefix(line, "branch ", &origin)) {
166
origin_data->is_local_branch = 1;
167
- origin = line + 7;
167
string_list_append(&src_data->branch, origin);
168
src_data->head_status |= 2;
170
- } else if (starts_with(line, "tag ")) {
169
+ } else if (skip_prefix(line, "tag ", &tag_name)) {
170
origin = line;
172
- string_list_append(&src_data->tag, origin + 4);
171
+ string_list_append(&src_data->tag, tag_name);
172
src_data->head_status |= 2;
173
} else if (skip_prefix(line, "remote-tracking branch ", &origin)) {
174
string_list_append(&src_data->r_branch, origin);