index 338f2094f32504b71d41e16062010b75e33e96a3..28b5dfd054ea8277379d6913b1f1c4cde225e70d 100644 (file)
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
+#include "builtin.h"
#include "cache.h"
#include "commit.h"
#include "diff.h"
static const char *fmt_merge_msg_usage =
"git-fmt-merge-msg [--summary] [--no-summary] [--file <file>]";
-static int merge_summary = 0;
+static int merge_summary;
static int fmt_merge_msg_config(const char *key, const char *value)
{
free_list(&subjects);
}
-int cmd_fmt_merge_msg(int argc, char **argv, char **envp)
+int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
{
int limit = 20, i = 0;
char line[1024];
const char *sep = "";
unsigned char head_sha1[20];
const char *head, *current_branch;
- const char *prefix = setup_git_directory();
git_config(fmt_merge_msg_config);