]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/apply-ws-fix-tab-in-indent'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:34:22 +0000 (09:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:34:22 +0000 (09:34 -0700)
"git apply --whitespace=fix" was not prepared to see a line getting
longer after fixing whitespaces (e.g. tab-in-indent aka Python).

* jc/apply-ws-fix-tab-in-indent:
  test: resurrect q_to_tab
  apply --whitespace=fix: avoid running over the postimage buffer

1  2 
builtin/apply.c
t/test-lib-functions.sh

diff --cc builtin/apply.c
Simple merge
Simple merge