Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p><a href="http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.4.txt" rel="nofollow noreferrer">Git1.6.0.4</a> seems a bit old, especially if you consider that:</p> <ul> <li>in <a href="http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.4.txt" rel="nofollow noreferrer">1.6.3.4</a>, "<code>git apply --whitespace=fix</code>" did not fix trailing whitespace on an incomplete line</li> <li>in <a href="http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.3.txt" rel="nofollow noreferrer">1.6.3.2</a>, "<code>whitespace</code>" attribute that is set was meant to detect all errors known to git, but it told git to ignore trailing carriage-returns.</li> </ul> <p>Could you try with Git1.6.4.1, and rather than setting a global config, set an attribute on the files you want a special whitespace handle, like this <a href="http://kerneltrap.org/mailarchive/git/2008/6/12/2112874/thread" rel="nofollow noreferrer">patch describes</a>.</p> <p>In a given directory, create a <code>.gitattributes</code> file.</p> <pre><code>* -whitespace </code></pre> <p>which will ignore any 'whitespace' errors.</p> <p>Now that will not prevent any conflict due to lack of consistency but that may be worth trying.</p> <hr> <p>The patch was a test about:</p> <blockquote> <p>Only ignore whitespace errors in <code>t/tNNNN-*.sh</code> and the <code>t/tNNNN</code> subdirectories.<br> Other files (like test libraries) should still be checked.</p> </blockquote> <pre><code>t/.gitattributes t[0-9][0-9][0-9][0-9]-*.sh -whitespace t[0-9][0-9][0-9][0-9]/* -whitespace </code></pre> <hr> <p>Note (Git 2.3.2+, Q1 2015, <a href="https://github.com/git/git/commit/0a80bc9f13bf4373778e787b3a050f5b784faf30" rel="nofollow noreferrer">commit 0a80bc9</a>, by Junio C Hamano aka <a href="https://github.com/gitster" rel="nofollow noreferrer"><code>gitster</code></a>) "<code>git apply --whitespace=fix</code>" is no longer silent:</p> <blockquote> <p>"<code>git apply --whitespace=fix</code>" fixed whitespace errors in the common context lines but did so without reporting.</p> <p>When the incoming patch has whitespace errors in a common context line (i.e. a line that is expected to be found and is not modified by the patch), "<code>apply --whitespace=fix</code>" corrects the whitespace errors the line has, in addition to the whitespace error on a line that is updated by the patch.<br> However, we did not count and report that we fixed whitespace errors on such lines.</p> </blockquote>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload