|
|
|
@ -19,6 +19,9 @@
@@ -19,6 +19,9 @@
|
|
|
|
|
#include "string-list.h" |
|
|
|
|
#include "notes-merge.h" |
|
|
|
|
|
|
|
|
|
static void commit_notes(struct notes_tree *t, const char *msg); |
|
|
|
|
static combine_notes_fn parse_combine_notes_fn(const char *v); |
|
|
|
|
|
|
|
|
|
static const char * const git_notes_usage[] = { |
|
|
|
|
N_("git notes [--ref <notes_ref>] [list [<object>]]"), |
|
|
|
|
N_("git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"), |
|
|
|
@ -288,7 +291,7 @@ static int parse_reedit_arg(const struct option *opt, const char *arg, int unset
@@ -288,7 +291,7 @@ static int parse_reedit_arg(const struct option *opt, const char *arg, int unset
|
|
|
|
|
return parse_reuse_arg(opt, arg, unset); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void commit_notes(struct notes_tree *t, const char *msg) |
|
|
|
|
static void commit_notes(struct notes_tree *t, const char *msg) |
|
|
|
|
{ |
|
|
|
|
struct strbuf buf = STRBUF_INIT; |
|
|
|
|
unsigned char commit_sha1[20]; |
|
|
|
@ -312,7 +315,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
@@ -312,7 +315,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
|
|
|
|
|
strbuf_release(&buf); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
combine_notes_fn parse_combine_notes_fn(const char *v) |
|
|
|
|
static combine_notes_fn parse_combine_notes_fn(const char *v) |
|
|
|
|
{ |
|
|
|
|
if (!strcasecmp(v, "overwrite")) |
|
|
|
|
return combine_notes_overwrite; |
|
|
|
|