diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2010-09-08 23:29:53 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-09 11:39:20 -0700 |
| commit | 1876166aaab56056083e6a61de4423d130d4dcc6 (patch) | |
| tree | 36aa247bd4c5ab3009ce3d8ee5837ad36ae34145 /builtin.h | |
| parent | fdc4408a8980392f2cc30dc125906a61edf170ec (diff) | |
| download | git-1876166aaab56056083e6a61de4423d130d4dcc6.tar.gz | |
fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
Give "shortlog_len" parameter to the fmt_merge_msg(), remove its
"merge_summary" parameter, and remove fmt_merge_msg_shortlog() function.
In the updated API, shortlog_len == 0 means no shortlog is given.
The parameter "merge_title" controls if the title of the merge commit is
autogenerated (it reads something like "Merge branch ..."), and typically
it is set to true when the caller does not give its own message.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Mentored-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
| -rw-r--r-- | builtin.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -7,6 +7,8 @@ #include "commit.h" #include "notes.h" +#define DEFAULT_MERGE_LOG_LEN 20 + extern const char git_version_string[]; extern const char git_usage_string[]; extern const char git_more_info_string[]; @@ -14,9 +16,8 @@ extern const char git_more_info_string[]; extern void list_common_cmds_help(void); extern const char *help_unknown_cmd(const char *cmd); extern void prune_packed_objects(int); -extern int fmt_merge_msg(int merge_summary, struct strbuf *in, - struct strbuf *out); -extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out); +extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out, + int merge_title, int shortlog_len); extern int commit_notes(struct notes_tree *t, const char *msg); struct notes_rewrite_cfg { |