mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
![Denton Liu](/assets/img/avatar_default.png)
In builtin.h, there exists the distinctly "lib-ish" function fmt_merge_msg(). This function can currently only be called by built-in commands but, unlike most of the other functions in the header, it does not make sense to impose this restriction as the functionality can be logically reused in libgit. Extract this function into fmt-merge-msg.c so that related definitions can exist clearly in their own header file. While we're at it, clean up #includes that are unused. This patch is best viewed with --color-moved. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
66 lines
1.8 KiB
C
66 lines
1.8 KiB
C
#include "builtin.h"
|
|
#include "config.h"
|
|
#include "fmt-merge-msg.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)
|
|
{
|
|
const char *inpath = NULL;
|
|
const char *message = NULL;
|
|
int shortlog_len = -1;
|
|
struct option options[] = {
|
|
{ OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
|
|
N_("populate log with at most <n> entries from shortlog"),
|
|
PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
|
|
{ OPTION_INTEGER, 0, "summary", &shortlog_len, N_("n"),
|
|
N_("alias for --log (deprecated)"),
|
|
PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, NULL,
|
|
DEFAULT_MERGE_LOG_LEN },
|
|
OPT_STRING('m', "message", &message, N_("text"),
|
|
N_("use <text> as start of message")),
|
|
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;
|
|
|
|
git_config(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;
|
|
|
|
ret = fmt_merge_msg(&input, &output, &opts);
|
|
if (ret)
|
|
return ret;
|
|
write_in_full(STDOUT_FILENO, output.buf, output.len);
|
|
return 0;
|
|
}
|