2023-04-11 07:41:50 +00:00
|
|
|
#include "git-compat-util.h"
|
2020-03-24 01:07:51 +00:00
|
|
|
#include "config.h"
|
2023-03-21 06:25:57 +00:00
|
|
|
#include "environment.h"
|
2020-03-24 01:07:51 +00:00
|
|
|
#include "refs.h"
|
2023-04-11 07:41:49 +00:00
|
|
|
#include "object-name.h"
|
2023-05-16 06:34:06 +00:00
|
|
|
#include "object-store-ll.h"
|
2020-03-24 01:07:51 +00:00
|
|
|
#include "diff.h"
|
2020-12-21 15:19:38 +00:00
|
|
|
#include "diff-merges.h"
|
2023-02-24 00:09:27 +00:00
|
|
|
#include "hex.h"
|
2020-03-24 01:07:51 +00:00
|
|
|
#include "revision.h"
|
|
|
|
|
#include "tag.h"
|
|
|
|
|
#include "string-list.h"
|
|
|
|
|
#include "branch.h"
|
|
|
|
|
#include "fmt-merge-msg.h"
|
|
|
|
|
#include "commit-reach.h"
|
2021-10-12 09:22:35 +00:00
|
|
|
#include "gpg-interface.h"
|
2023-05-16 06:34:03 +00:00
|
|
|
#include "wildmatch.h"
|
2020-03-24 01:07:51 +00:00
|
|
|
|
|
|
|
|
static int use_branch_desc;
|
2020-07-29 22:50:01 +00:00
|
|
|
static int suppress_dest_pattern_seen;
|
|
|
|
|
static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
|
2020-03-24 01:07:51 +00:00
|
|
|
|
config: add ctx arg to config_fn_t
Add a new "const struct config_context *ctx" arg to config_fn_t to hold
additional information about the config iteration operation.
config_context has a "struct key_value_info kvi" member that holds
metadata about the config source being read (e.g. what kind of config
source it is, the filename, etc). In this series, we're only interested
in .kvi, so we could have just used "struct key_value_info" as an arg,
but config_context makes it possible to add/adjust members in the future
without changing the config_fn_t signature. We could also consider other
ways of organizing the args (e.g. moving the config name and value into
config_context or key_value_info), but in my experiments, the
incremental benefit doesn't justify the added complexity (e.g. a
config_fn_t will sometimes invoke another config_fn_t but with a
different config value).
In subsequent commits, the .kvi member will replace the global "struct
config_reader" in config.c, making config iteration a global-free
operation. It requires much more work for the machinery to provide
meaningful values of .kvi, so for now, merely change the signature and
call sites, pass NULL as a placeholder value, and don't rely on the arg
in any meaningful way.
Most of the changes are performed by
contrib/coccinelle/config_fn_ctx.pending.cocci, which, for every
config_fn_t:
- Modifies the signature to accept "const struct config_context *ctx"
- Passes "ctx" to any inner config_fn_t, if needed
- Adds UNUSED attributes to "ctx", if needed
Most config_fn_t instances are easily identified by seeing if they are
called by the various config functions. Most of the remaining ones are
manually named in the .cocci patch. Manual cleanups are still needed,
but the majority of it is trivial; it's either adjusting config_fn_t
that the .cocci patch didn't catch, or adding forward declarations of
"struct config_context ctx" to make the signatures make sense.
The non-trivial changes are in cases where we are invoking a config_fn_t
outside of config machinery, and we now need to decide what value of
"ctx" to pass. These cases are:
- trace2/tr2_cfg.c:tr2_cfg_set_fl()
This is indirectly called by git_config_set() so that the trace2
machinery can notice the new config values and update its settings
using the tr2 config parsing function, i.e. tr2_cfg_cb().
- builtin/checkout.c:checkout_main()
This calls git_xmerge_config() as a shorthand for parsing a CLI arg.
This might be worth refactoring away in the future, since
git_xmerge_config() can call git_default_config(), which can do much
more than just parsing.
Handle them by creating a KVI_INIT macro that initializes "struct
key_value_info" to a reasonable default, and use that to construct the
"ctx" arg.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-28 19:26:22 +00:00
|
|
|
int fmt_merge_msg_config(const char *key, const char *value,
|
|
|
|
|
const struct config_context *ctx, void *cb)
|
2020-03-24 01:07:51 +00:00
|
|
|
{
|
|
|
|
|
if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
|
|
|
|
|
int is_bool;
|
config: pass kvi to die_bad_number()
Plumb "struct key_value_info" through all code paths that end in
die_bad_number(), which lets us remove the helper functions that read
analogous values from "struct config_reader". As a result, nothing reads
config_reader.config_kvi any more, so remove that too.
In config.c, this requires changing the signature of
git_configset_get_value() to 'return' "kvi" in an out parameter so that
git_configset_get_<type>() can pass it to git_config_<type>(). Only
numeric types will use "kvi", so for non-numeric types (e.g.
git_configset_get_string()), pass NULL to indicate that the out
parameter isn't needed.
Outside of config.c, config callbacks now need to pass "ctx->kvi" to any
of the git_config_<type>() functions that parse a config string into a
number type. Included is a .cocci patch to make that refactor.
The only exceptional case is builtin/config.c, where git_config_<type>()
is called outside of a config callback (namely, on user-provided input),
so config source information has never been available. In this case,
die_bad_number() defaults to a generic, but perfectly descriptive
message. Let's provide a safe, non-NULL for "kvi" anyway, but make sure
not to change the message.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-28 19:26:27 +00:00
|
|
|
merge_log_config = git_config_bool_or_int(key, value, ctx->kvi, &is_bool);
|
2020-03-24 01:07:51 +00:00
|
|
|
if (!is_bool && merge_log_config < 0)
|
|
|
|
|
return error("%s: negative length %s", key, value);
|
|
|
|
|
if (is_bool && merge_log_config)
|
|
|
|
|
merge_log_config = DEFAULT_MERGE_LOG_LEN;
|
|
|
|
|
} else if (!strcmp(key, "merge.branchdesc")) {
|
|
|
|
|
use_branch_desc = git_config_bool(key, value);
|
2020-07-29 22:50:01 +00:00
|
|
|
} else if (!strcmp(key, "merge.suppressdest")) {
|
|
|
|
|
if (!value)
|
|
|
|
|
return config_error_nonbool(key);
|
|
|
|
|
if (!*value)
|
|
|
|
|
string_list_clear(&suppress_dest_patterns, 0);
|
|
|
|
|
else
|
|
|
|
|
string_list_append(&suppress_dest_patterns, value);
|
|
|
|
|
suppress_dest_pattern_seen = 1;
|
2020-03-24 01:07:51 +00:00
|
|
|
} else {
|
config: add ctx arg to config_fn_t
Add a new "const struct config_context *ctx" arg to config_fn_t to hold
additional information about the config iteration operation.
config_context has a "struct key_value_info kvi" member that holds
metadata about the config source being read (e.g. what kind of config
source it is, the filename, etc). In this series, we're only interested
in .kvi, so we could have just used "struct key_value_info" as an arg,
but config_context makes it possible to add/adjust members in the future
without changing the config_fn_t signature. We could also consider other
ways of organizing the args (e.g. moving the config name and value into
config_context or key_value_info), but in my experiments, the
incremental benefit doesn't justify the added complexity (e.g. a
config_fn_t will sometimes invoke another config_fn_t but with a
different config value).
In subsequent commits, the .kvi member will replace the global "struct
config_reader" in config.c, making config iteration a global-free
operation. It requires much more work for the machinery to provide
meaningful values of .kvi, so for now, merely change the signature and
call sites, pass NULL as a placeholder value, and don't rely on the arg
in any meaningful way.
Most of the changes are performed by
contrib/coccinelle/config_fn_ctx.pending.cocci, which, for every
config_fn_t:
- Modifies the signature to accept "const struct config_context *ctx"
- Passes "ctx" to any inner config_fn_t, if needed
- Adds UNUSED attributes to "ctx", if needed
Most config_fn_t instances are easily identified by seeing if they are
called by the various config functions. Most of the remaining ones are
manually named in the .cocci patch. Manual cleanups are still needed,
but the majority of it is trivial; it's either adjusting config_fn_t
that the .cocci patch didn't catch, or adding forward declarations of
"struct config_context ctx" to make the signatures make sense.
The non-trivial changes are in cases where we are invoking a config_fn_t
outside of config machinery, and we now need to decide what value of
"ctx" to pass. These cases are:
- trace2/tr2_cfg.c:tr2_cfg_set_fl()
This is indirectly called by git_config_set() so that the trace2
machinery can notice the new config values and update its settings
using the tr2 config parsing function, i.e. tr2_cfg_cb().
- builtin/checkout.c:checkout_main()
This calls git_xmerge_config() as a shorthand for parsing a CLI arg.
This might be worth refactoring away in the future, since
git_xmerge_config() can call git_default_config(), which can do much
more than just parsing.
Handle them by creating a KVI_INIT macro that initializes "struct
key_value_info" to a reasonable default, and use that to construct the
"ctx" arg.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-28 19:26:22 +00:00
|
|
|
return git_default_config(key, value, ctx, cb);
|
2020-03-24 01:07:51 +00:00
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* merge data per repository where the merged tips came from */
|
|
|
|
|
struct src_data {
|
|
|
|
|
struct string_list branch, tag, r_branch, generic;
|
|
|
|
|
int head_status;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct origin_data {
|
|
|
|
|
struct object_id oid;
|
|
|
|
|
unsigned is_local_branch:1;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void init_src_data(struct src_data *data)
|
|
|
|
|
{
|
|
|
|
|
data->branch.strdup_strings = 1;
|
|
|
|
|
data->tag.strdup_strings = 1;
|
|
|
|
|
data->r_branch.strdup_strings = 1;
|
|
|
|
|
data->generic.strdup_strings = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct string_list srcs = STRING_LIST_INIT_DUP;
|
|
|
|
|
static struct string_list origins = STRING_LIST_INIT_DUP;
|
|
|
|
|
|
|
|
|
|
struct merge_parents {
|
|
|
|
|
int alloc, nr;
|
|
|
|
|
struct merge_parent {
|
|
|
|
|
struct object_id given;
|
|
|
|
|
struct object_id commit;
|
|
|
|
|
unsigned char used;
|
|
|
|
|
} *item;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* I know, I know, this is inefficient, but you won't be pulling and merging
|
|
|
|
|
* hundreds of heads at a time anyway.
|
|
|
|
|
*/
|
|
|
|
|
static struct merge_parent *find_merge_parent(struct merge_parents *table,
|
|
|
|
|
struct object_id *given,
|
|
|
|
|
struct object_id *commit)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 0; i < table->nr; i++) {
|
|
|
|
|
if (given && !oideq(&table->item[i].given, given))
|
|
|
|
|
continue;
|
|
|
|
|
if (commit && !oideq(&table->item[i].commit, commit))
|
|
|
|
|
continue;
|
|
|
|
|
return &table->item[i];
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void add_merge_parent(struct merge_parents *table,
|
|
|
|
|
struct object_id *given,
|
|
|
|
|
struct object_id *commit)
|
|
|
|
|
{
|
|
|
|
|
if (table->nr && find_merge_parent(table, given, commit))
|
|
|
|
|
return;
|
|
|
|
|
ALLOC_GROW(table->item, table->nr + 1, table->alloc);
|
|
|
|
|
oidcpy(&table->item[table->nr].given, given);
|
|
|
|
|
oidcpy(&table->item[table->nr].commit, commit);
|
|
|
|
|
table->item[table->nr].used = 0;
|
|
|
|
|
table->nr++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int handle_line(char *line, struct merge_parents *merge_parents)
|
|
|
|
|
{
|
|
|
|
|
int i, len = strlen(line);
|
|
|
|
|
struct origin_data *origin_data;
|
|
|
|
|
char *src;
|
|
|
|
|
const char *origin, *tag_name;
|
2021-07-25 13:08:19 +00:00
|
|
|
char *to_free = NULL;
|
2020-03-24 01:07:51 +00:00
|
|
|
struct src_data *src_data;
|
|
|
|
|
struct string_list_item *item;
|
|
|
|
|
int pulling_head = 0;
|
|
|
|
|
struct object_id oid;
|
|
|
|
|
const unsigned hexsz = the_hash_algo->hexsz;
|
|
|
|
|
|
|
|
|
|
if (len < hexsz + 3 || line[hexsz] != '\t')
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
if (starts_with(line + hexsz + 1, "not-for-merge"))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
if (line[hexsz + 1] != '\t')
|
|
|
|
|
return 2;
|
|
|
|
|
|
|
|
|
|
i = get_oid_hex(line, &oid);
|
|
|
|
|
if (i)
|
|
|
|
|
return 3;
|
|
|
|
|
|
|
|
|
|
if (!find_merge_parent(merge_parents, &oid, NULL))
|
|
|
|
|
return 0; /* subsumed by other parents */
|
|
|
|
|
|
2021-03-13 16:17:22 +00:00
|
|
|
CALLOC_ARRAY(origin_data, 1);
|
2020-03-24 01:07:51 +00:00
|
|
|
oidcpy(&origin_data->oid, &oid);
|
|
|
|
|
|
|
|
|
|
if (line[len - 1] == '\n')
|
|
|
|
|
line[len - 1] = 0;
|
|
|
|
|
line += hexsz + 2;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* At this point, line points at the beginning of comment e.g.
|
|
|
|
|
* "branch 'frotz' of git://that/repository.git".
|
|
|
|
|
* Find the repository name and point it with src.
|
|
|
|
|
*/
|
|
|
|
|
src = strstr(line, " of ");
|
|
|
|
|
if (src) {
|
|
|
|
|
*src = 0;
|
|
|
|
|
src += 4;
|
|
|
|
|
pulling_head = 0;
|
|
|
|
|
} else {
|
|
|
|
|
src = line;
|
|
|
|
|
pulling_head = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
item = unsorted_string_list_lookup(&srcs, src);
|
|
|
|
|
if (!item) {
|
|
|
|
|
item = string_list_append(&srcs, src);
|
|
|
|
|
item->util = xcalloc(1, sizeof(struct src_data));
|
|
|
|
|
init_src_data(item->util);
|
|
|
|
|
}
|
|
|
|
|
src_data = item->util;
|
|
|
|
|
|
|
|
|
|
if (pulling_head) {
|
|
|
|
|
origin = src;
|
|
|
|
|
src_data->head_status |= 1;
|
|
|
|
|
} else if (skip_prefix(line, "branch ", &origin)) {
|
|
|
|
|
origin_data->is_local_branch = 1;
|
|
|
|
|
string_list_append(&src_data->branch, origin);
|
|
|
|
|
src_data->head_status |= 2;
|
|
|
|
|
} else if (skip_prefix(line, "tag ", &tag_name)) {
|
|
|
|
|
origin = line;
|
|
|
|
|
string_list_append(&src_data->tag, tag_name);
|
|
|
|
|
src_data->head_status |= 2;
|
|
|
|
|
} else if (skip_prefix(line, "remote-tracking branch ", &origin)) {
|
|
|
|
|
string_list_append(&src_data->r_branch, origin);
|
|
|
|
|
src_data->head_status |= 2;
|
|
|
|
|
} else {
|
|
|
|
|
origin = src;
|
|
|
|
|
string_list_append(&src_data->generic, line);
|
|
|
|
|
src_data->head_status |= 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!strcmp(".", src) || !strcmp(src, origin)) {
|
|
|
|
|
int len = strlen(origin);
|
|
|
|
|
if (origin[0] == '\'' && origin[len - 1] == '\'')
|
2021-07-25 13:08:19 +00:00
|
|
|
origin = to_free = xmemdupz(origin + 1, len - 2);
|
2020-03-24 01:07:51 +00:00
|
|
|
} else
|
2021-07-25 13:08:19 +00:00
|
|
|
origin = to_free = xstrfmt("%s of %s", origin, src);
|
2020-03-24 01:07:51 +00:00
|
|
|
if (strcmp(".", src))
|
|
|
|
|
origin_data->is_local_branch = 0;
|
|
|
|
|
string_list_append(&origins, origin)->util = origin_data;
|
2021-07-25 13:08:19 +00:00
|
|
|
free(to_free);
|
2020-03-24 01:07:51 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void print_joined(const char *singular, const char *plural,
|
|
|
|
|
struct string_list *list, struct strbuf *out)
|
|
|
|
|
{
|
|
|
|
|
if (list->nr == 0)
|
|
|
|
|
return;
|
|
|
|
|
if (list->nr == 1) {
|
|
|
|
|
strbuf_addf(out, "%s%s", singular, list->items[0].string);
|
|
|
|
|
} else {
|
|
|
|
|
int i;
|
|
|
|
|
strbuf_addstr(out, plural);
|
|
|
|
|
for (i = 0; i < list->nr - 1; i++)
|
|
|
|
|
strbuf_addf(out, "%s%s", i > 0 ? ", " : "",
|
|
|
|
|
list->items[i].string);
|
|
|
|
|
strbuf_addf(out, " and %s", list->items[list->nr - 1].string);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void add_branch_desc(struct strbuf *out, const char *name)
|
|
|
|
|
{
|
|
|
|
|
struct strbuf desc = STRBUF_INIT;
|
|
|
|
|
|
|
|
|
|
if (!read_branch_desc(&desc, name)) {
|
|
|
|
|
const char *bp = desc.buf;
|
|
|
|
|
while (*bp) {
|
|
|
|
|
const char *ep = strchrnul(bp, '\n');
|
|
|
|
|
if (*ep)
|
|
|
|
|
ep++;
|
|
|
|
|
strbuf_addf(out, " : %.*s", (int)(ep - bp), bp);
|
|
|
|
|
bp = ep;
|
|
|
|
|
}
|
|
|
|
|
strbuf_complete_line(out);
|
|
|
|
|
}
|
|
|
|
|
strbuf_release(&desc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define util_as_integral(elem) ((intptr_t)((elem)->util))
|
|
|
|
|
|
|
|
|
|
static void record_person_from_buf(int which, struct string_list *people,
|
|
|
|
|
const char *buffer)
|
|
|
|
|
{
|
|
|
|
|
char *name_buf, *name, *name_end;
|
|
|
|
|
struct string_list_item *elem;
|
|
|
|
|
const char *field;
|
|
|
|
|
|
|
|
|
|
field = (which == 'a') ? "\nauthor " : "\ncommitter ";
|
|
|
|
|
name = strstr(buffer, field);
|
|
|
|
|
if (!name)
|
|
|
|
|
return;
|
|
|
|
|
name += strlen(field);
|
|
|
|
|
name_end = strchrnul(name, '<');
|
|
|
|
|
if (*name_end)
|
|
|
|
|
name_end--;
|
|
|
|
|
while (isspace(*name_end) && name <= name_end)
|
|
|
|
|
name_end--;
|
|
|
|
|
if (name_end < name)
|
|
|
|
|
return;
|
|
|
|
|
name_buf = xmemdupz(name, name_end - name + 1);
|
|
|
|
|
|
|
|
|
|
elem = string_list_lookup(people, name_buf);
|
|
|
|
|
if (!elem) {
|
|
|
|
|
elem = string_list_insert(people, name_buf);
|
|
|
|
|
elem->util = (void *)0;
|
|
|
|
|
}
|
|
|
|
|
elem->util = (void*)(util_as_integral(elem) + 1);
|
|
|
|
|
free(name_buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void record_person(int which, struct string_list *people,
|
|
|
|
|
struct commit *commit)
|
|
|
|
|
{
|
2023-03-28 13:58:48 +00:00
|
|
|
const char *buffer = repo_get_commit_buffer(the_repository, commit,
|
|
|
|
|
NULL);
|
2020-03-24 01:07:51 +00:00
|
|
|
record_person_from_buf(which, people, buffer);
|
2023-03-28 13:58:48 +00:00
|
|
|
repo_unuse_commit_buffer(the_repository, commit, buffer);
|
2020-03-24 01:07:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int cmp_string_list_util_as_integral(const void *a_, const void *b_)
|
|
|
|
|
{
|
|
|
|
|
const struct string_list_item *a = a_, *b = b_;
|
|
|
|
|
return util_as_integral(b) - util_as_integral(a);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void add_people_count(struct strbuf *out, struct string_list *people)
|
|
|
|
|
{
|
|
|
|
|
if (people->nr == 1)
|
|
|
|
|
strbuf_addstr(out, people->items[0].string);
|
|
|
|
|
else if (people->nr == 2)
|
|
|
|
|
strbuf_addf(out, "%s (%d) and %s (%d)",
|
|
|
|
|
people->items[0].string,
|
|
|
|
|
(int)util_as_integral(&people->items[0]),
|
|
|
|
|
people->items[1].string,
|
|
|
|
|
(int)util_as_integral(&people->items[1]));
|
|
|
|
|
else if (people->nr)
|
|
|
|
|
strbuf_addf(out, "%s (%d) and others",
|
|
|
|
|
people->items[0].string,
|
|
|
|
|
(int)util_as_integral(&people->items[0]));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void credit_people(struct strbuf *out,
|
|
|
|
|
struct string_list *them,
|
|
|
|
|
int kind)
|
|
|
|
|
{
|
|
|
|
|
const char *label;
|
|
|
|
|
const char *me;
|
|
|
|
|
|
|
|
|
|
if (kind == 'a') {
|
|
|
|
|
label = "By";
|
|
|
|
|
me = git_author_info(IDENT_NO_DATE);
|
|
|
|
|
} else {
|
|
|
|
|
label = "Via";
|
|
|
|
|
me = git_committer_info(IDENT_NO_DATE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!them->nr ||
|
|
|
|
|
(them->nr == 1 &&
|
|
|
|
|
me &&
|
|
|
|
|
skip_prefix(me, them->items->string, &me) &&
|
|
|
|
|
starts_with(me, " <")))
|
|
|
|
|
return;
|
|
|
|
|
strbuf_addf(out, "\n%c %s ", comment_line_char, label);
|
|
|
|
|
add_people_count(out, them);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void add_people_info(struct strbuf *out,
|
|
|
|
|
struct string_list *authors,
|
|
|
|
|
struct string_list *committers)
|
|
|
|
|
{
|
|
|
|
|
QSORT(authors->items, authors->nr,
|
|
|
|
|
cmp_string_list_util_as_integral);
|
|
|
|
|
QSORT(committers->items, committers->nr,
|
|
|
|
|
cmp_string_list_util_as_integral);
|
|
|
|
|
|
|
|
|
|
credit_people(out, authors, 'a');
|
|
|
|
|
credit_people(out, committers, 'c');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void shortlog(const char *name,
|
|
|
|
|
struct origin_data *origin_data,
|
|
|
|
|
struct commit *head,
|
|
|
|
|
struct rev_info *rev,
|
|
|
|
|
struct fmt_merge_msg_opts *opts,
|
|
|
|
|
struct strbuf *out)
|
|
|
|
|
{
|
|
|
|
|
int i, count = 0;
|
|
|
|
|
struct commit *commit;
|
|
|
|
|
struct object *branch;
|
|
|
|
|
struct string_list subjects = STRING_LIST_INIT_DUP;
|
|
|
|
|
struct string_list authors = STRING_LIST_INIT_DUP;
|
|
|
|
|
struct string_list committers = STRING_LIST_INIT_DUP;
|
|
|
|
|
int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;
|
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
|
const struct object_id *oid = &origin_data->oid;
|
|
|
|
|
int limit = opts->shortlog_len;
|
|
|
|
|
|
|
|
|
|
branch = deref_tag(the_repository, parse_object(the_repository, oid),
|
|
|
|
|
oid_to_hex(oid),
|
|
|
|
|
the_hash_algo->hexsz);
|
|
|
|
|
if (!branch || branch->type != OBJ_COMMIT)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
setup_revisions(0, NULL, rev, NULL);
|
|
|
|
|
add_pending_object(rev, branch, name);
|
|
|
|
|
add_pending_object(rev, &head->object, "^HEAD");
|
|
|
|
|
head->object.flags |= UNINTERESTING;
|
|
|
|
|
if (prepare_revision_walk(rev))
|
|
|
|
|
die("revision walk setup failed");
|
|
|
|
|
while ((commit = get_revision(rev)) != NULL) {
|
|
|
|
|
struct pretty_print_context ctx = {0};
|
|
|
|
|
|
|
|
|
|
if (commit->parents && commit->parents->next) {
|
|
|
|
|
/* do not list a merge but count committer */
|
|
|
|
|
if (opts->credit_people)
|
|
|
|
|
record_person('c', &committers, commit);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!count && opts->credit_people)
|
|
|
|
|
/* the 'tip' committer */
|
|
|
|
|
record_person('c', &committers, commit);
|
|
|
|
|
if (opts->credit_people)
|
|
|
|
|
record_person('a', &authors, commit);
|
|
|
|
|
count++;
|
|
|
|
|
if (subjects.nr > limit)
|
|
|
|
|
continue;
|
|
|
|
|
|
2023-03-28 13:58:51 +00:00
|
|
|
repo_format_commit_message(the_repository, commit, "%s", &sb,
|
|
|
|
|
&ctx);
|
2020-03-24 01:07:51 +00:00
|
|
|
strbuf_ltrim(&sb);
|
|
|
|
|
|
|
|
|
|
if (!sb.len)
|
|
|
|
|
string_list_append(&subjects,
|
|
|
|
|
oid_to_hex(&commit->object.oid));
|
|
|
|
|
else
|
|
|
|
|
string_list_append_nodup(&subjects,
|
|
|
|
|
strbuf_detach(&sb, NULL));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opts->credit_people)
|
|
|
|
|
add_people_info(out, &authors, &committers);
|
|
|
|
|
if (count > limit)
|
|
|
|
|
strbuf_addf(out, "\n* %s: (%d commits)\n", name, count);
|
|
|
|
|
else
|
|
|
|
|
strbuf_addf(out, "\n* %s:\n", name);
|
|
|
|
|
|
|
|
|
|
if (origin_data->is_local_branch && use_branch_desc)
|
|
|
|
|
add_branch_desc(out, name);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < subjects.nr; i++)
|
|
|
|
|
if (i >= limit)
|
|
|
|
|
strbuf_addstr(out, " ...\n");
|
|
|
|
|
else
|
|
|
|
|
strbuf_addf(out, " %s\n", subjects.items[i].string);
|
|
|
|
|
|
|
|
|
|
clear_commit_marks((struct commit *)branch, flags);
|
|
|
|
|
clear_commit_marks(head, flags);
|
|
|
|
|
free_commit_list(rev->commits);
|
|
|
|
|
rev->commits = NULL;
|
|
|
|
|
rev->pending.nr = 0;
|
|
|
|
|
|
|
|
|
|
string_list_clear(&authors, 0);
|
|
|
|
|
string_list_clear(&committers, 0);
|
|
|
|
|
string_list_clear(&subjects, 0);
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-29 22:50:01 +00:00
|
|
|
/*
|
|
|
|
|
* See if dest_branch matches with any glob pattern on the
|
|
|
|
|
* suppress_dest_patterns list.
|
|
|
|
|
*
|
|
|
|
|
* We may want to also allow negative matches e.g. ":!glob" like we do
|
|
|
|
|
* for pathspec, but for now, let's keep it simple and stupid.
|
|
|
|
|
*/
|
|
|
|
|
static int dest_suppressed(const char *dest_branch)
|
|
|
|
|
{
|
|
|
|
|
struct string_list_item *item;
|
|
|
|
|
|
|
|
|
|
for_each_string_list_item(item, &suppress_dest_patterns) {
|
|
|
|
|
if (!wildmatch(item->string, dest_branch, WM_PATHNAME))
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-24 01:07:51 +00:00
|
|
|
static void fmt_merge_msg_title(struct strbuf *out,
|
|
|
|
|
const char *current_branch)
|
|
|
|
|
{
|
|
|
|
|
int i = 0;
|
|
|
|
|
char *sep = "";
|
|
|
|
|
|
|
|
|
|
strbuf_addstr(out, "Merge ");
|
|
|
|
|
for (i = 0; i < srcs.nr; i++) {
|
|
|
|
|
struct src_data *src_data = srcs.items[i].util;
|
|
|
|
|
const char *subsep = "";
|
|
|
|
|
|
|
|
|
|
strbuf_addstr(out, sep);
|
|
|
|
|
sep = "; ";
|
|
|
|
|
|
|
|
|
|
if (src_data->head_status == 1) {
|
|
|
|
|
strbuf_addstr(out, srcs.items[i].string);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (src_data->head_status == 3) {
|
|
|
|
|
subsep = ", ";
|
|
|
|
|
strbuf_addstr(out, "HEAD");
|
|
|
|
|
}
|
|
|
|
|
if (src_data->branch.nr) {
|
|
|
|
|
strbuf_addstr(out, subsep);
|
|
|
|
|
subsep = ", ";
|
|
|
|
|
print_joined("branch ", "branches ", &src_data->branch,
|
|
|
|
|
out);
|
|
|
|
|
}
|
|
|
|
|
if (src_data->r_branch.nr) {
|
|
|
|
|
strbuf_addstr(out, subsep);
|
|
|
|
|
subsep = ", ";
|
|
|
|
|
print_joined("remote-tracking branch ", "remote-tracking branches ",
|
|
|
|
|
&src_data->r_branch, out);
|
|
|
|
|
}
|
|
|
|
|
if (src_data->tag.nr) {
|
|
|
|
|
strbuf_addstr(out, subsep);
|
|
|
|
|
subsep = ", ";
|
|
|
|
|
print_joined("tag ", "tags ", &src_data->tag, out);
|
|
|
|
|
}
|
|
|
|
|
if (src_data->generic.nr) {
|
|
|
|
|
strbuf_addstr(out, subsep);
|
|
|
|
|
print_joined("commit ", "commits ", &src_data->generic,
|
|
|
|
|
out);
|
|
|
|
|
}
|
|
|
|
|
if (strcmp(".", srcs.items[i].string))
|
|
|
|
|
strbuf_addf(out, " of %s", srcs.items[i].string);
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-29 22:50:01 +00:00
|
|
|
if (!dest_suppressed(current_branch))
|
|
|
|
|
strbuf_addf(out, " into %s", current_branch);
|
|
|
|
|
strbuf_addch(out, '\n');
|
2020-03-24 01:07:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void fmt_tag_signature(struct strbuf *tagbuf,
|
|
|
|
|
struct strbuf *sig,
|
|
|
|
|
const char *buf,
|
|
|
|
|
unsigned long len)
|
|
|
|
|
{
|
|
|
|
|
const char *tag_body = strstr(buf, "\n\n");
|
|
|
|
|
if (tag_body) {
|
|
|
|
|
tag_body += 2;
|
|
|
|
|
strbuf_add(tagbuf, tag_body, buf + len - tag_body);
|
|
|
|
|
}
|
|
|
|
|
strbuf_complete_line(tagbuf);
|
|
|
|
|
if (sig->len) {
|
|
|
|
|
strbuf_addch(tagbuf, '\n');
|
2023-06-06 19:48:43 +00:00
|
|
|
strbuf_add_commented_lines(tagbuf, sig->buf, sig->len,
|
|
|
|
|
comment_line_char);
|
2020-03-24 01:07:51 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void fmt_merge_msg_sigs(struct strbuf *out)
|
|
|
|
|
{
|
|
|
|
|
int i, tag_number = 0, first_tag = 0;
|
|
|
|
|
struct strbuf tagbuf = STRBUF_INIT;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < origins.nr; i++) {
|
|
|
|
|
struct object_id *oid = origins.items[i].util;
|
|
|
|
|
enum object_type type;
|
2021-02-11 02:08:03 +00:00
|
|
|
unsigned long size;
|
2023-03-28 13:58:50 +00:00
|
|
|
char *buf = repo_read_object_file(the_repository, oid, &type,
|
|
|
|
|
&size);
|
2021-02-11 02:08:03 +00:00
|
|
|
char *origbuf = buf;
|
|
|
|
|
unsigned long len = size;
|
2020-05-01 20:39:56 +00:00
|
|
|
struct signature_check sigc = { NULL };
|
2021-02-11 02:08:03 +00:00
|
|
|
struct strbuf payload = STRBUF_INIT, sig = STRBUF_INIT;
|
2020-03-24 01:07:51 +00:00
|
|
|
|
|
|
|
|
if (!buf || type != OBJ_TAG)
|
|
|
|
|
goto next;
|
|
|
|
|
|
2021-02-11 02:08:03 +00:00
|
|
|
if (!parse_signature(buf, size, &payload, &sig))
|
|
|
|
|
;/* merely annotated */
|
|
|
|
|
else {
|
|
|
|
|
buf = payload.buf;
|
|
|
|
|
len = payload.len;
|
2021-12-09 08:52:48 +00:00
|
|
|
sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
|
2021-12-09 08:52:43 +00:00
|
|
|
sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
|
|
|
|
|
if (check_signature(&sigc, sig.buf, sig.len) &&
|
2021-09-10 20:07:34 +00:00
|
|
|
!sigc.output)
|
2021-02-11 02:08:03 +00:00
|
|
|
strbuf_addstr(&sig, "gpg verification failed.\n");
|
|
|
|
|
else
|
2021-09-10 20:07:34 +00:00
|
|
|
strbuf_addstr(&sig, sigc.output);
|
2021-02-11 02:08:03 +00:00
|
|
|
}
|
2020-03-24 01:07:51 +00:00
|
|
|
|
|
|
|
|
if (!tag_number++) {
|
|
|
|
|
fmt_tag_signature(&tagbuf, &sig, buf, len);
|
|
|
|
|
first_tag = i;
|
|
|
|
|
} else {
|
|
|
|
|
if (tag_number == 2) {
|
|
|
|
|
struct strbuf tagline = STRBUF_INIT;
|
|
|
|
|
strbuf_addch(&tagline, '\n');
|
|
|
|
|
strbuf_add_commented_lines(&tagline,
|
|
|
|
|
origins.items[first_tag].string,
|
2023-06-06 19:48:43 +00:00
|
|
|
strlen(origins.items[first_tag].string),
|
|
|
|
|
comment_line_char);
|
2020-03-24 01:07:51 +00:00
|
|
|
strbuf_insert(&tagbuf, 0, tagline.buf,
|
|
|
|
|
tagline.len);
|
|
|
|
|
strbuf_release(&tagline);
|
|
|
|
|
}
|
|
|
|
|
strbuf_addch(&tagbuf, '\n');
|
|
|
|
|
strbuf_add_commented_lines(&tagbuf,
|
|
|
|
|
origins.items[i].string,
|
2023-06-06 19:48:43 +00:00
|
|
|
strlen(origins.items[i].string),
|
|
|
|
|
comment_line_char);
|
2020-03-24 01:07:51 +00:00
|
|
|
fmt_tag_signature(&tagbuf, &sig, buf, len);
|
|
|
|
|
}
|
2021-02-11 02:08:03 +00:00
|
|
|
strbuf_release(&payload);
|
2020-03-24 01:07:51 +00:00
|
|
|
strbuf_release(&sig);
|
fmt-merge-msg: prevent use-after-free with signed tags
When merging a signed tag, fmt_merge_msg_sigs() is responsible for
populating the body of the merge message with the names of the signed
tags, their signatures, and the validity of those signatures.
In 02769437e1 (ssh signing: use sigc struct to pass payload,
2021-12-09), check_signature() was taught to pass the object payload via
the sigc struct instead of passing the payload buffer separately.
In effect, 02769437e1 causes buf, and sigc.payload to point at the same
region in memory. This causes a problem for fmt_tag_signature(), which
wants to read from this location, since it is freed beforehand by
signature_check_clear() (which frees it via sigc's `payload` member).
That makes the subsequent use in fmt_tag_signature() a use-after-free.
As a result, merge messages did not contain the body of any signed tags.
Luckily, they tend not to contain garbage, either, since the result of
strstr()-ing the object buffer in fmt_tag_signature() is guarded:
const char *tag_body = strstr(buf, "\n\n");
if (tag_body) {
tag_body += 2;
strbuf_add(tagbuf, tag_body, buf + len - tag_body);
}
Unfortunately, the tests in t6200 did not catch this at the time because
they do not search for the body of signed tags in fmt-merge-msg's
output.
Resolve this by waiting to call signature_check_clear() until after its
contents can be safely discarded. Harden ourselves against any future
regressions in this area by making sure we can find signed tag messages
in the output of fmt-merge-msg, too.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-01-10 21:19:06 +00:00
|
|
|
signature_check_clear(&sigc);
|
2020-03-24 01:07:51 +00:00
|
|
|
next:
|
2021-02-11 02:08:03 +00:00
|
|
|
free(origbuf);
|
2020-03-24 01:07:51 +00:00
|
|
|
}
|
|
|
|
|
if (tagbuf.len) {
|
|
|
|
|
strbuf_addch(out, '\n');
|
|
|
|
|
strbuf_addbuf(out, &tagbuf);
|
|
|
|
|
}
|
|
|
|
|
strbuf_release(&tagbuf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void find_merge_parents(struct merge_parents *result,
|
|
|
|
|
struct strbuf *in, struct object_id *head)
|
|
|
|
|
{
|
|
|
|
|
struct commit_list *parents;
|
|
|
|
|
struct commit *head_commit;
|
|
|
|
|
int pos = 0, i, j;
|
|
|
|
|
|
|
|
|
|
parents = NULL;
|
|
|
|
|
while (pos < in->len) {
|
|
|
|
|
int len;
|
|
|
|
|
char *p = in->buf + pos;
|
|
|
|
|
char *newline = strchr(p, '\n');
|
|
|
|
|
const char *q;
|
|
|
|
|
struct object_id oid;
|
|
|
|
|
struct commit *parent;
|
|
|
|
|
struct object *obj;
|
|
|
|
|
|
|
|
|
|
len = newline ? newline - p : strlen(p);
|
|
|
|
|
pos += len + !!newline;
|
|
|
|
|
|
|
|
|
|
if (parse_oid_hex(p, &oid, &q) ||
|
|
|
|
|
q[0] != '\t' ||
|
|
|
|
|
q[1] != '\t')
|
|
|
|
|
continue; /* skip not-for-merge */
|
|
|
|
|
/*
|
|
|
|
|
* Do not use get_merge_parent() here; we do not have
|
|
|
|
|
* "name" here and we do not want to contaminate its
|
|
|
|
|
* util field yet.
|
|
|
|
|
*/
|
|
|
|
|
obj = parse_object(the_repository, &oid);
|
2023-03-28 13:58:46 +00:00
|
|
|
parent = (struct commit *)repo_peel_to_type(the_repository,
|
|
|
|
|
NULL, 0, obj,
|
|
|
|
|
OBJ_COMMIT);
|
2020-03-24 01:07:51 +00:00
|
|
|
if (!parent)
|
|
|
|
|
continue;
|
|
|
|
|
commit_list_insert(parent, &parents);
|
|
|
|
|
add_merge_parent(result, &obj->oid, &parent->object.oid);
|
|
|
|
|
}
|
|
|
|
|
head_commit = lookup_commit(the_repository, head);
|
|
|
|
|
if (head_commit)
|
|
|
|
|
commit_list_insert(head_commit, &parents);
|
|
|
|
|
reduce_heads_replace(&parents);
|
|
|
|
|
|
|
|
|
|
while (parents) {
|
|
|
|
|
struct commit *cmit = pop_commit(&parents);
|
|
|
|
|
for (i = 0; i < result->nr; i++)
|
|
|
|
|
if (oideq(&result->item[i].commit, &cmit->object.oid))
|
|
|
|
|
result->item[i].used = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = j = 0; i < result->nr; i++) {
|
|
|
|
|
if (result->item[i].used) {
|
|
|
|
|
if (i != j)
|
|
|
|
|
result->item[j] = result->item[i];
|
|
|
|
|
j++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
result->nr = j;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
|
|
|
|
|
struct fmt_merge_msg_opts *opts)
|
|
|
|
|
{
|
|
|
|
|
int i = 0, pos = 0;
|
|
|
|
|
struct object_id head_oid;
|
|
|
|
|
const char *current_branch;
|
|
|
|
|
void *current_branch_to_free;
|
|
|
|
|
struct merge_parents merge_parents;
|
|
|
|
|
|
2020-10-23 13:59:58 +00:00
|
|
|
if (!suppress_dest_pattern_seen) {
|
|
|
|
|
string_list_append(&suppress_dest_patterns, "main");
|
2020-07-29 22:50:01 +00:00
|
|
|
string_list_append(&suppress_dest_patterns, "master");
|
2020-10-23 13:59:58 +00:00
|
|
|
}
|
2020-07-29 22:50:01 +00:00
|
|
|
|
2020-03-24 01:07:51 +00:00
|
|
|
memset(&merge_parents, 0, sizeof(merge_parents));
|
|
|
|
|
|
merge: allow to pretend a merge is made into a different branch
When a series of patches for a topic-B depends on having topic-A,
the workflow to prepare the topic-B branch would look like this:
$ git checkout -b topic-B main
$ git merge --no-ff --no-edit topic-A
$ git am <mbox-for-topic-B
When topic-A gets updated, recreating the first merge and rebasing
the rest of the topic-B, all on detached HEAD, is a useful
technique. After updating topic-A with its new round of patches:
$ git checkout topic-B
$ prev=$(git rev-parse 'HEAD^{/^Merge branch .topic-A. into}')
$ git checkout --detach $prev^1
$ git merge --no-ff --no-edit topic-A
$ git rebase --onto HEAD $prev @{-1}^0
$ git checkout -B @{-1}
This will
(0) check out the current topic-B.
(1) find the previous merge of topic-A into topic-B.
(2) detach the HEAD to the parent of the previous merge.
(3) merge the updated topic-A to it.
(4) reapply the patches to rebuild the rest of topic-B.
(5) update topic-B with the result.
without contaminating the reflog of topic-B too much. topic-B@{1}
is the "logically previous" state before topic-A got updated, for
example. At (4), comparison (e.g. range-diff) between HEAD and
@{-1} is a meaningful way to sanity check the result, and the same
can be done at (5) by comparing topic-B and topic-B@{1}.
But there is one glitch. The merge into the detached HEAD done in
the step (3) above gives us "Merge branch 'topic-A' into HEAD", and
does not say "into topic-B".
Teach the "--into-name=<branch>" option to "git merge" and its
underlying "git fmt-merge-message", to pretend as if we were merging
into <branch>, no matter what branch we are actually merging into,
when they prepare the merge message. The pretend name honors the
usual "into <target>" suppression mechanism, which can be seen in
the tests added here.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-20 22:53:43 +00:00
|
|
|
/* learn the commit that we merge into and the current branch name */
|
2020-03-24 01:07:51 +00:00
|
|
|
current_branch = current_branch_to_free =
|
|
|
|
|
resolve_refdup("HEAD", RESOLVE_REF_READING, &head_oid, NULL);
|
|
|
|
|
if (!current_branch)
|
|
|
|
|
die("No current branch");
|
merge: allow to pretend a merge is made into a different branch
When a series of patches for a topic-B depends on having topic-A,
the workflow to prepare the topic-B branch would look like this:
$ git checkout -b topic-B main
$ git merge --no-ff --no-edit topic-A
$ git am <mbox-for-topic-B
When topic-A gets updated, recreating the first merge and rebasing
the rest of the topic-B, all on detached HEAD, is a useful
technique. After updating topic-A with its new round of patches:
$ git checkout topic-B
$ prev=$(git rev-parse 'HEAD^{/^Merge branch .topic-A. into}')
$ git checkout --detach $prev^1
$ git merge --no-ff --no-edit topic-A
$ git rebase --onto HEAD $prev @{-1}^0
$ git checkout -B @{-1}
This will
(0) check out the current topic-B.
(1) find the previous merge of topic-A into topic-B.
(2) detach the HEAD to the parent of the previous merge.
(3) merge the updated topic-A to it.
(4) reapply the patches to rebuild the rest of topic-B.
(5) update topic-B with the result.
without contaminating the reflog of topic-B too much. topic-B@{1}
is the "logically previous" state before topic-A got updated, for
example. At (4), comparison (e.g. range-diff) between HEAD and
@{-1} is a meaningful way to sanity check the result, and the same
can be done at (5) by comparing topic-B and topic-B@{1}.
But there is one glitch. The merge into the detached HEAD done in
the step (3) above gives us "Merge branch 'topic-A' into HEAD", and
does not say "into topic-B".
Teach the "--into-name=<branch>" option to "git merge" and its
underlying "git fmt-merge-message", to pretend as if we were merging
into <branch>, no matter what branch we are actually merging into,
when they prepare the merge message. The pretend name honors the
usual "into <target>" suppression mechanism, which can be seen in
the tests added here.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-20 22:53:43 +00:00
|
|
|
|
|
|
|
|
if (opts->into_name)
|
|
|
|
|
current_branch = opts->into_name;
|
|
|
|
|
else if (starts_with(current_branch, "refs/heads/"))
|
2020-03-24 01:07:51 +00:00
|
|
|
current_branch += 11;
|
|
|
|
|
|
|
|
|
|
find_merge_parents(&merge_parents, in, &head_oid);
|
|
|
|
|
|
|
|
|
|
/* get a line */
|
|
|
|
|
while (pos < in->len) {
|
|
|
|
|
int len;
|
|
|
|
|
char *newline, *p = in->buf + pos;
|
|
|
|
|
|
|
|
|
|
newline = strchr(p, '\n');
|
|
|
|
|
len = newline ? newline - p : strlen(p);
|
|
|
|
|
pos += len + !!newline;
|
|
|
|
|
i++;
|
|
|
|
|
p[len] = 0;
|
|
|
|
|
if (handle_line(p, &merge_parents))
|
|
|
|
|
die("error in line %d: %.*s", i, len, p);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opts->add_title && srcs.nr)
|
|
|
|
|
fmt_merge_msg_title(out, current_branch);
|
|
|
|
|
|
|
|
|
|
if (origins.nr)
|
|
|
|
|
fmt_merge_msg_sigs(out);
|
|
|
|
|
|
|
|
|
|
if (opts->shortlog_len) {
|
|
|
|
|
struct commit *head;
|
|
|
|
|
struct rev_info rev;
|
|
|
|
|
|
|
|
|
|
head = lookup_commit_or_die(&head_oid, "HEAD");
|
|
|
|
|
repo_init_revisions(the_repository, &rev, NULL);
|
|
|
|
|
rev.commit_format = CMIT_FMT_ONELINE;
|
2020-12-21 15:19:38 +00:00
|
|
|
diff_merges_suppress(&rev);
|
2020-03-24 01:07:51 +00:00
|
|
|
rev.limited = 1;
|
|
|
|
|
|
|
|
|
|
strbuf_complete_line(out);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < origins.nr; i++)
|
|
|
|
|
shortlog(origins.items[i].string,
|
|
|
|
|
origins.items[i].util,
|
|
|
|
|
head, &rev, opts, out);
|
2022-04-13 20:01:36 +00:00
|
|
|
release_revisions(&rev);
|
2020-03-24 01:07:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
strbuf_complete_line(out);
|
|
|
|
|
free(current_branch_to_free);
|
|
|
|
|
free(merge_parents.item);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|