![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jeff King <peff@peff.net> | |
| Thu, 12 May 2011 11:09:46 +0000 (07:09 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 20:00:30 +0000 (13:00 -0700) | ||
| commit | 161807349aa1ee853880a5c6e39c53f55b10077d | |
| tree | aaf6d538b6c81fddf445b6f649042aed125571f9 | tree | snapshot |
| parent | 96dbe93da541cb930bacd4e2df0a95e41d4c6441 | commit | diff |
cherry-pick: handle root commits with external strategies
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diff | blob | history |