9ce196e86b
In 036876a106 (config: hide functions using `the_repository` by
default, 2024-08-13) we have moved around a bunch of functions in the
config subsystem that depend on `the_repository`. Those function have
been converted into mere wrappers around their equivalent function that
takes in a repository as parameter, and the intent was that we'll
eventually remove those wrappers to make the dependency on the global
repository variable explicit at the callsite.
Follow through with that intent and remove `git_config()`. All callsites
are adjusted so that they use `repo_config(the_repository, ...)`
instead. While some callsites might already have a repository available,
this mechanical conversion is the exact same as the current situation
and thus cannot cause any regression. Those sites should eventually be
cleaned up in a later patch series.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
92 lines
2.4 KiB
C
92 lines
2.4 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
#include "builtin.h"
|
|
#include "config.h"
|
|
#include "fmt-merge-msg.h"
|
|
#include "gettext.h"
|
|
#include "parse-options.h"
|
|
|
|
static const char * const fmt_merge_msg_usage[] = {
|
|
N_("git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"),
|
|
NULL
|
|
};
|
|
|
|
int cmd_fmt_merge_msg(int argc,
|
|
const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
char *inpath = NULL;
|
|
const char *message = NULL;
|
|
char *into_name = NULL;
|
|
int shortlog_len = -1;
|
|
struct option options[] = {
|
|
{
|
|
.type = OPTION_INTEGER,
|
|
.long_name = "log",
|
|
.value = &shortlog_len,
|
|
.precision = sizeof(shortlog_len),
|
|
.argh = N_("n"),
|
|
.help = N_("populate log with at most <n> entries from shortlog"),
|
|
.flags = PARSE_OPT_OPTARG,
|
|
.defval = DEFAULT_MERGE_LOG_LEN,
|
|
},
|
|
{
|
|
.type = OPTION_INTEGER,
|
|
.long_name = "summary",
|
|
.value = &shortlog_len,
|
|
.precision = sizeof(shortlog_len),
|
|
.argh = N_("n"),
|
|
.help = N_("alias for --log (deprecated)"),
|
|
.flags = PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN,
|
|
.defval = DEFAULT_MERGE_LOG_LEN,
|
|
},
|
|
OPT_STRING('m', "message", &message, N_("text"),
|
|
N_("use <text> as start of message")),
|
|
OPT_STRING(0, "into-name", &into_name, N_("name"),
|
|
N_("use <name> instead of the real target branch")),
|
|
OPT_FILENAME('F', "file", &inpath, N_("file to read from")),
|
|
OPT_END()
|
|
};
|
|
|
|
FILE *in = stdin;
|
|
struct strbuf input = STRBUF_INIT, output = STRBUF_INIT;
|
|
int ret;
|
|
struct fmt_merge_msg_opts opts;
|
|
|
|
repo_config(the_repository, fmt_merge_msg_config, NULL);
|
|
argc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage,
|
|
0);
|
|
if (argc > 0)
|
|
usage_with_options(fmt_merge_msg_usage, options);
|
|
if (shortlog_len < 0)
|
|
shortlog_len = (merge_log_config > 0) ? merge_log_config : 0;
|
|
|
|
if (inpath && strcmp(inpath, "-")) {
|
|
in = fopen(inpath, "r");
|
|
if (!in)
|
|
die_errno("cannot open '%s'", inpath);
|
|
}
|
|
|
|
if (strbuf_read(&input, fileno(in), 0) < 0)
|
|
die_errno("could not read input file");
|
|
|
|
if (message)
|
|
strbuf_addstr(&output, message);
|
|
|
|
memset(&opts, 0, sizeof(opts));
|
|
opts.add_title = !message;
|
|
opts.credit_people = 1;
|
|
opts.shortlog_len = shortlog_len;
|
|
opts.into_name = into_name;
|
|
|
|
ret = fmt_merge_msg(&input, &output, &opts);
|
|
if (ret)
|
|
return ret;
|
|
write_in_full(STDOUT_FILENO, output.buf, output.len);
|
|
|
|
strbuf_release(&input);
|
|
strbuf_release(&output);
|
|
free(inpath);
|
|
return 0;
|
|
}
|