diff options
| author |  Jeff King <peff@peff.net> | 2011-05-12 07:09:46 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-05-16 13:00:30 -0700 |
| commit | 161807349aa1ee853880a5c6e39c53f55b10077d (patch) | |
| tree | aaf6d538b6c81fddf445b6f649042aed125571f9 /t/t5515/fetch.br-branches-default-merge_branches-default | |
| parent | Update draft release notes to 1.7.5.2 (diff) | |
| download | tgif-161807349aa1ee853880a5c6e39c53f55b10077d.tar.xz | |
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>
Diffstat (limited to 't/t5515/fetch.br-branches-default-merge_branches-default')
0 files changed, 0 insertions, 0 deletions