summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.5.5.5.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2019-08-05 15:33:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-06 10:42:36 -0700
commitff6d54771af2c92867f773a264200f22b4cb2ab9 (patch)
tree13324e6ddcd4623d514d19ce2a865b53a581df7d /Documentation/RelNotes/1.5.5.5.txt
parentRelNotes/2.21.1: typofix (diff)
downloadtgif-ff6d54771af2c92867f773a264200f22b4cb2ab9.tar.xz
merge-recursive: avoid directory rename detection in recursive case
Ever since commit 8c8e5bd6eb33 ("merge-recursive: switch directory rename detection default", 2019-04-05), the default handling with directory rename detection was to report a conflict and leave unstaged entries in the index. However, when creating a virtual merge base in the recursive case, we absolutely need a tree, and the only way a tree can be written is if we have no unstaged entries -- otherwise we hit a BUG(). There are a few fixes possible here which at least fix the BUG(), but none of them seem optimal for other reasons; see the comments with the new testcase 13e in t6043 for details (which testcase triggered a BUG() prior to this patch). As such, just opt for a very conservative and simple choice that is still relatively reasonable: have the recursive case treat 'conflict' as 'false' for opt->detect_directory_renames. Reported-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.5.5.5.txt')
0 files changed, 0 insertions, 0 deletions