mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
ce6521e441
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>
20 lines
420 B
C
20 lines
420 B
C
#ifndef FMT_MERGE_MSG_H
|
|
#define FMT_MERGE_MSG_H
|
|
|
|
#include "strbuf.h"
|
|
|
|
#define DEFAULT_MERGE_LOG_LEN 20
|
|
|
|
struct fmt_merge_msg_opts {
|
|
unsigned add_title:1,
|
|
credit_people:1;
|
|
int shortlog_len;
|
|
};
|
|
|
|
extern int merge_log_config;
|
|
int fmt_merge_msg_config(const char *key, const char *value, void *cb);
|
|
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
|
|
struct fmt_merge_msg_opts *);
|
|
|
|
|
|
#endif /* FMT_MERGE_MSG_H */
|