summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-03-24 01:07:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-24 22:04:43 (GMT)
commitce6521e44139f12d00b49e1fa89dde096d58b0f1 (patch)
tree9a49164992dcee32631c9cde46d8b536c7ef5d27 /builtin.h
parent274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925 (diff)
downloadgit-ce6521e44139f12d00b49e1fa89dde096d58b0f1.zip
git-ce6521e44139f12d00b49e1fa89dde096d58b0f1.tar.gz
git-ce6521e44139f12d00b49e1fa89dde096d58b0f1.tar.bz2
Lib-ify fmt-merge-msg
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>
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/builtin.h b/builtin.h
index 2b25a80..6101d98 100644
--- a/builtin.h
+++ b/builtin.h
@@ -94,8 +94,6 @@
* command.
*/
-#define DEFAULT_MERGE_LOG_LEN 20
-
extern const char git_usage_string[];
extern const char git_more_info_string[];
@@ -104,15 +102,6 @@ extern const char git_more_info_string[];
void prune_packed_objects(int);
-struct fmt_merge_msg_opts {
- unsigned add_title:1,
- credit_people:1;
- int shortlog_len;
-};
-
-int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
- struct fmt_merge_msg_opts *);
-
/**
* If a built-in has DELAY_PAGER_CONFIG set, the built-in should call this early
* when it wishes to respect the `pager.foo`-config. The `cmd` is the name of