[PATCH 1/3] cherry-pick: handle root commits with external strategies
- From
Jeff King <peff@peff.net>
- Date
- May 12, 2011, 11:09 UTC
- Message-ID
- <20110512110946.GA5292@sigill.intra.peff.net>
- In-Reply-To
- <20110512110855.GA5240@sigill.intra.peff.net>
The merge-recursive strategy already handles root commits; it cherry-picks the difference between the empty tree and the root commit's tree.
However, for external strategies, we dereference NULL and segfault while building the argument list. Instead, let's handle this by passing the empty tree sha1 to the merge script.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/merge.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c index 9661c8f..5098bf6 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -599,6 +599,14 @@ static void write_tree_trivial(unsigned char *sha1) die(_("git write-tree failed to write a tree")); } +static const char *merge_argument(struct commit *commit) +{ + if (commit) + return sha1_to_hex(commit->object.sha1); + else + return EMPTY_TREE_SHA1_HEX; +} + int try_merge_command(const char *strategy, size_t xopts_nr, const char **xopts, struct commit_list *common, const char *head_arg, struct commit_list *remotes) @@ -619,11 +627,11 @@ int try_merge_command(const char *strategy, size_t xopts_nr, args[i++] = s; } for (j = common; j; j = j->next) - args[i++] = xstrdup(sha1_to_hex(j->item->object.sha1)); + args[i++] = xstrdup(merge_argument(j->item)); args[i++] = "--"; args[i++] = head_arg; for (j = remotes; j; j = j->next) - args[i++] = xstrdup(sha1_to_hex(j->item->object.sha1)); + args[i++] = xstrdup(merge_argument(j->item)); args[i] = NULL; ret = run_command_v_opt(args, RUN_GIT_CMD); strbuf_release(&buf);
-- 1.7.5.1.12.ga7abed