projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.3.0
[platform/upstream/git.git]
/
builtin
/
fmt-merge-msg.c
diff --git
a/builtin/fmt-merge-msg.c
b/builtin/fmt-merge-msg.c
index
d9af43c
..
af7919e
100644
(file)
--- a/
builtin/fmt-merge-msg.c
+++ b/
builtin/fmt-merge-msg.c
@@
-100,7
+100,8
@@
static int handle_line(char *line, struct merge_parents *merge_parents)
{
int i, len = strlen(line);
struct origin_data *origin_data;
{
int i, len = strlen(line);
struct origin_data *origin_data;
- char *src, *origin;
+ char *src;
+ const char *origin;
struct src_data *src_data;
struct string_list_item *item;
int pulling_head = 0;
struct src_data *src_data;
struct string_list_item *item;
int pulling_head = 0;
@@
-109,7
+110,7
@@
static int handle_line(char *line, struct merge_parents *merge_parents)
if (len < 43 || line[40] != '\t')
return 1;
if (len < 43 || line[40] != '\t')
return 1;
- if (
!prefixcmp
(line + 41, "not-for-merge"))
+ if (
starts_with
(line + 41, "not-for-merge"))
return 0;
if (line[41] != '\t')
return 0;
if (line[41] != '\t')
@@
-155,17
+156,16
@@
static int handle_line(char *line, struct merge_parents *merge_parents)
if (pulling_head) {
origin = src;
src_data->head_status |= 1;
if (pulling_head) {
origin = src;
src_data->head_status |= 1;
- } else if (
!prefixcmp
(line, "branch ")) {
+ } else if (
starts_with
(line, "branch ")) {
origin_data->is_local_branch = 1;
origin = line + 7;
string_list_append(&src_data->branch, origin);
src_data->head_status |= 2;
origin_data->is_local_branch = 1;
origin = line + 7;
string_list_append(&src_data->branch, origin);
src_data->head_status |= 2;
- } else if (
!prefixcmp
(line, "tag ")) {
+ } else if (
starts_with
(line, "tag ")) {
origin = line;
string_list_append(&src_data->tag, origin + 4);
src_data->head_status |= 2;
origin = line;
string_list_append(&src_data->tag, origin + 4);
src_data->head_status |= 2;
- } else if (!prefixcmp(line, "remote-tracking branch ")) {
- origin = line + strlen("remote-tracking branch ");
+ } else if (skip_prefix(line, "remote-tracking branch ", &origin)) {
string_list_append(&src_data->r_branch, origin);
src_data->head_status |= 2;
} else {
string_list_append(&src_data->r_branch, origin);
src_data->head_status |= 2;
} else {
@@
-178,11
+178,8
@@
static int handle_line(char *line, struct merge_parents *merge_parents)
int len = strlen(origin);
if (origin[0] == '\'' && origin[len - 1] == '\'')
origin = xmemdupz(origin + 1, len - 2);
int len = strlen(origin);
if (origin[0] == '\'' && origin[len - 1] == '\'')
origin = xmemdupz(origin + 1, len - 2);
- } else {
- char *new_origin = xmalloc(strlen(origin) + strlen(src) + 5);
- sprintf(new_origin, "%s of %s", origin, src);
- origin = new_origin;
- }
+ } else
+ origin = xstrfmt("%s of %s", origin, src);
if (strcmp(".", src))
origin_data->is_local_branch = 0;
string_list_append(&origins, origin)->util = origin_data;
if (strcmp(".", src))
origin_data->is_local_branch = 0;
string_list_append(&origins, origin)->util = origin_data;
@@
-219,8
+216,7
@@
static void add_branch_desc(struct strbuf *out, const char *name)
strbuf_addf(out, " : %.*s", (int)(ep - bp), bp);
bp = ep;
}
strbuf_addf(out, " : %.*s", (int)(ep - bp), bp);
bp = ep;
}
- if (out->buf[out->len - 1] != '\n')
- strbuf_addch(out, '\n');
+ strbuf_complete_line(out);
}
strbuf_release(&desc);
}
}
strbuf_release(&desc);
}
@@
-230,12
+226,14
@@
static void add_branch_desc(struct strbuf *out, const char *name)
static void record_person(int which, struct string_list *people,
struct commit *commit)
{
static void record_person(int which, struct string_list *people,
struct commit *commit)
{
+ const char *buffer;
char *name_buf, *name, *name_end;
struct string_list_item *elem;
const char *field;
field = (which == 'a') ? "\nauthor " : "\ncommitter ";
char *name_buf, *name, *name_end;
struct string_list_item *elem;
const char *field;
field = (which == 'a') ? "\nauthor " : "\ncommitter ";
- name = strstr(commit->buffer, field);
+ buffer = get_commit_buffer(commit, NULL);
+ name = strstr(buffer, field);
if (!name)
return;
name += strlen(field);
if (!name)
return;
name += strlen(field);
@@
-247,6
+245,7
@@
static void record_person(int which, struct string_list *people,
if (name_end < name)
return;
name_buf = xmemdupz(name, name_end - name + 1);
if (name_end < name)
return;
name_buf = xmemdupz(name, name_end - name + 1);
+ unuse_commit_buffer(commit, buffer);
elem = string_list_lookup(people, name_buf);
if (!elem) {
elem = string_list_lookup(people, name_buf);
if (!elem) {
@@
-287,20
+286,20
@@
static void credit_people(struct strbuf *out,
const char *me;
if (kind == 'a') {
const char *me;
if (kind == 'a') {
- label = "
\n# By
";
+ label = "
By
";
me = git_author_info(IDENT_NO_DATE);
} else {
me = git_author_info(IDENT_NO_DATE);
} else {
- label = "
\n# Via
";
+ label = "
Via
";
me = git_committer_info(IDENT_NO_DATE);
}
if (!them->nr ||
(them->nr == 1 &&
me &&
me = git_committer_info(IDENT_NO_DATE);
}
if (!them->nr ||
(them->nr == 1 &&
me &&
-
(me = skip_prefix(me, them->items->string)) != NULL
&&
- s
kip_prefix
(me, " <")))
+
skip_prefix(me, them->items->string, &me)
&&
+ s
tarts_with
(me, " <")))
return;
return;
- strbuf_add
str(out
, label);
+ strbuf_add
f(out, "\n%c %s ", comment_line_char
, label);
add_people_count(out, them);
}
add_people_count(out, them);
}
@@
-470,7
+469,7
@@
static void fmt_tag_signature(struct strbuf *tagbuf,
strbuf_complete_line(tagbuf);
if (sig->len) {
strbuf_addch(tagbuf, '\n');
strbuf_complete_line(tagbuf);
if (sig->len) {
strbuf_addch(tagbuf, '\n');
- strbuf_add_
lines(tagbuf, "# "
, sig->buf, sig->len);
+ strbuf_add_
commented_lines(tagbuf
, sig->buf, sig->len);
}
}
}
}
@@
-492,7
+491,7
@@
static void fmt_merge_msg_sigs(struct strbuf *out)
if (size == len)
; /* merely annotated */
if (size == len)
; /* merely annotated */
- else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig)) {
+ else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig
, NULL
)) {
if (!sig.len)
strbuf_addstr(&sig, "gpg verification failed.\n");
}
if (!sig.len)
strbuf_addstr(&sig, "gpg verification failed.\n");
}
@@
-503,14
+502,18
@@
static void fmt_merge_msg_sigs(struct strbuf *out)
} else {
if (tag_number == 2) {
struct strbuf tagline = STRBUF_INIT;
} else {
if (tag_number == 2) {
struct strbuf tagline = STRBUF_INIT;
- strbuf_addf(&tagline, "\n# %s\n",
- origins.items[first_tag].string);
+ strbuf_addch(&tagline, '\n');
+ strbuf_add_commented_lines(&tagline,
+ origins.items[first_tag].string,
+ strlen(origins.items[first_tag].string));
strbuf_insert(&tagbuf, 0, tagline.buf,
tagline.len);
strbuf_release(&tagline);
}
strbuf_insert(&tagbuf, 0, tagline.buf,
tagline.len);
strbuf_release(&tagline);
}
- strbuf_addf(&tagbuf, "\n# %s\n",
- origins.items[i].string);
+ strbuf_addch(&tagbuf, '\n');
+ strbuf_add_commented_lines(&tagbuf,
+ origins.items[i].string,
+ strlen(origins.items[i].string));
fmt_tag_signature(&tagbuf, &sig, buf, len);
}
strbuf_release(&sig);
fmt_tag_signature(&tagbuf, &sig, buf, len);
}
strbuf_release(&sig);
@@
-598,10
+601,10
@@
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
/* get current branch */
current_branch = current_branch_to_free =
/* get current branch */
current_branch = current_branch_to_free =
- resolve_refdup("HEAD",
head_sha1,
1, NULL);
+ resolve_refdup("HEAD",
RESOLVE_REF_READING, head_sha
1, NULL);
if (!current_branch)
die("No current branch");
if (!current_branch)
die("No current branch");
- if (
!prefixcmp
(current_branch, "refs/heads/"))
+ if (
starts_with
(current_branch, "refs/heads/"))
current_branch += 11;
find_merge_parents(&merge_parents, in, head_sha1);
current_branch += 11;
find_merge_parents(&merge_parents, in, head_sha1);