From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2008 01:23:17 +0000 (-0800)
Subject: Merge branch 'jc/apply-whitespace'
X-Git-Tag: v1.5.5-rc0~156
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e38f892d1832977511c4e7c82204c7f94c3a3232;p=git.git

Merge branch 'jc/apply-whitespace'

* jc/apply-whitespace:
  ws_fix_copy(): move the whitespace fixing function to ws.c
  apply: do not barf on patch with too large an offset
  core.whitespace: cr-at-eol
  git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run
  builtin-apply.c: pass ws_rule down to match_fragment()
  builtin-apply.c: move copy_wsfix() function a bit higher.
  builtin-apply.c: do not feed copy_wsfix() leading '+'
  builtin-apply.c: simplify calling site to apply_line()
  builtin-apply.c: clean-up apply_one_fragment()
  builtin-apply.c: mark common context lines in lineinfo structure.
  builtin-apply.c: optimize match_beginning/end processing a bit.
  builtin-apply.c: make it more line oriented
  builtin-apply.c: push match-beginning/end logic down
  builtin-apply.c: restructure "offset" matching
  builtin-apply.c: refactor small part that matches context
---

e38f892d1832977511c4e7c82204c7f94c3a3232