X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Ffmt-merge-msg.c;h=5189b16c9e59c20b449435c413c34da9f7bf9baa;hb=3d90c796503efa3ca9812575a41cb8b019d27218;hp=78c77742b6e6863b1eb4d61750ae253710223aa2;hpb=ba0254cb32537b7a7e92854a51256475ee83cdda;p=git.git

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 78c77742b..5189b16c9 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -100,8 +100,8 @@ static int handle_line(char *line)
 		origin = line;
 		string_list_append(&src_data->tag, origin + 4);
 		src_data->head_status |= 2;
-	} else if (!prefixcmp(line, "remote branch ")) {
-		origin = line + 14;
+	} else if (!prefixcmp(line, "remote-tracking branch ")) {
+		origin = line + strlen("remote-tracking branch ");
 		string_list_append(&src_data->r_branch, origin);
 		src_data->head_status |= 2;
 	} else {
@@ -233,7 +233,7 @@ static void do_fmt_merge_msg_title(struct strbuf *out,
 		if (src_data->r_branch.nr) {
 			strbuf_addstr(out, subsep);
 			subsep = ", ";
-			print_joined("remote branch ", "remote branches ",
+			print_joined("remote-tracking branch ", "remote-tracking branches ",
 					&src_data->r_branch, out);
 		}
 		if (src_data->tag.nr) {