summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-08-23 00:51:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-23 13:17:59 -0700
commit78ed710fcf1a67a40eeca1be1a1bb8e8b7296177 (patch)
treed45e4b431dce96f6f7a8e4440370d865d84008ba /git-merge-resolve.sh
parentMerge branch 'maint-1.6.0' into maint-1.6.1 (diff)
downloadtgif-78ed710fcf1a67a40eeca1be1a1bb8e8b7296177.tar.xz
xutils: Fix hashing an incomplete line with whitespaces at the end
Upon seeing a whitespace, xdl_hash_record_with_whitespace() first skipped the run of whitespaces (excluding LF) that begins there, ensuring that the pointer points at the last whitespace character in the run, and assumed that the next character must be LF at the end of the line. This does not work when hashing an incomplete line, which lacks the LF at the end. Introduce "at_eol" variable that is true when either we are at the end of line (looking at LF) or at the end of an incomplete line, and use that instead throughout the code. Noticed by Thell Fowler. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions