summaryrefslogtreecommitdiff
path: root/Documentation/howto/rebase-from-internal-branch.txt
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2013-07-23 10:28:08 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-23 12:09:48 -0700
commitdf6308eb82bc9d2074b35387583548b8b153433d (patch)
tree4edf2970e95e0dcedb2d2e8b97c44d7ea15b3057 /Documentation/howto/rebase-from-internal-branch.txt
parentrange-set: satisfy non-empty ranges invariant (diff)
downloadtgif-df6308eb82bc9d2074b35387583548b8b153433d.tar.xz
line-log: fix "log -LN" crash when N is last line of file
range-set invariants are: ranges must be (1) non-empty, (2) disjoint, (3) sorted in ascending order. line_log_data_insert() breaks the non-empty invariant under the following conditions: the incoming range is empty and the pathname attached to the range has not yet been encountered. In this case, line_log_data_insert() assigns the empty range to a new line_log_data record without taking any action to ensure that the empty range is eventually folded out. Subsequent range-set functions crash or throw an assertion failure upon encountering such an anomaly. Fix this bug. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Acked-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/rebase-from-internal-branch.txt')
0 files changed, 0 insertions, 0 deletions