Jacob Keller <jacob.e.kel...@intel.com> writes:
> From: Jacob Keller <jacob.kel...@gmail.com>
>
> Combining rewrite and notes-merge functionality has been left as an
> exercise for a future contributor.
This comment is probably unnecessary; we haven't even established if
such a combination is desirable AFAICT in the discussion.
The patch itself looks very straightforward and obviously good.
Thanks.
>
> Signed-off-by: Jacob Keller <jacob.kel...@gmail.com>
> ---
> builtin/notes.c | 12 +-----------
> notes-utils.c | 18 ++++++++++++++++++
> notes-utils.h | 1 +
> 3 files changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/builtin/notes.c b/builtin/notes.c
> index 042348082709..0e7aba98f4d7 100644
> --- a/builtin/notes.c
> +++ b/builtin/notes.c
> @@ -797,17 +797,7 @@ static int merge(int argc, const char **argv, const char
> *prefix)
> o.remote_ref = remote_ref.buf;
>
> if (strategy) {
> - if (!strcmp(strategy, "manual"))
> - o.strategy = NOTES_MERGE_RESOLVE_MANUAL;
> - else if (!strcmp(strategy, "ours"))
> - o.strategy = NOTES_MERGE_RESOLVE_OURS;
> - else if (!strcmp(strategy, "theirs"))
> - o.strategy = NOTES_MERGE_RESOLVE_THEIRS;
> - else if (!strcmp(strategy, "union"))
> - o.strategy = NOTES_MERGE_RESOLVE_UNION;
> - else if (!strcmp(strategy, "cat_sort_uniq"))
> - o.strategy = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ;
> - else {
> + if (parse_notes_merge_strategy(strategy, &o.strategy)) {
> error("Unknown -s/--strategy: %s", strategy);
> usage_with_options(git_notes_merge_usage, options);
> }
> diff --git a/notes-utils.c b/notes-utils.c
> index ccbf0737a34e..299e34bccc58 100644
> --- a/notes-utils.c
> +++ b/notes-utils.c
> @@ -54,6 +54,24 @@ void commit_notes(struct notes_tree *t, const char *msg)
> strbuf_release(&buf);
> }
>
> +int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s)
> +{
> + if (!strcmp(v, "manual"))
> + *s = NOTES_MERGE_RESOLVE_MANUAL;
> + else if (!strcmp(v, "ours"))
> + *s = NOTES_MERGE_RESOLVE_OURS;
> + else if (!strcmp(v, "theirs"))
> + *s = NOTES_MERGE_RESOLVE_THEIRS;
> + else if (!strcmp(v, "union"))
> + *s = NOTES_MERGE_RESOLVE_UNION;
> + else if (!strcmp(v, "cat_sort_uniq"))
> + *s = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ;
> + else
> + return -1;
> +
> + return 0;
> +}
> +
> static combine_notes_fn parse_combine_notes_fn(const char *v)
> {
> if (!strcasecmp(v, "overwrite"))
> diff --git a/notes-utils.h b/notes-utils.h
> index db5811e3f718..fa538e1d9502 100644
> --- a/notes-utils.h
> +++ b/notes-utils.h
> @@ -37,6 +37,7 @@ struct notes_rewrite_cfg {
> int mode_from_env;
> };
>
> +int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
> struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
> int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
> const unsigned char *from_obj, const unsigned char
> *to_obj);
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
