git whitespace woes

by

Git1.6.0.4 seems a bit old, especially if you consider that:

  • in 1.6.3.4, “git apply --whitespace=fix” did not fix trailing whitespace on an
    incomplete line
  • in 1.6.3.2, “whitespace” attribute that is set was meant to detect all errors known
    to git, but it told git to ignore trailing carriage-returns.

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 patch describes.

In a given directory, create a .gitattributes file.

* -whitespace

which will ignore any ‘whitespace’ errors.

Now that will not prevent any conflict due to lack of consistency but that may be worth trying.

The patch was a test about:

Only ignore whitespace errors in t/tNNNN-*.sh and the t/tNNNN subdirectories.
Other files (like test libraries) should still be checked.

t/.gitattributes
t[0-9][0-9][0-9][0-9]-*.sh  -whitespace
t[0-9][0-9][0-9][0-9]/*     -whitespace

Note (Git 2.3.2+, Q1 2015, commit 0a80bc9, by Junio C Hamano aka gitster) “git apply --whitespace=fix” is no longer silent:

“git apply --whitespace=fix” fixed whitespace errors in the common
context lines but did so without reporting.

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), “apply --whitespace=fix” corrects the whitespace errors the line has, in addition to the whitespace error on a line that is updated by the patch.
However, we did not count and report that we fixed whitespace errors on such lines.

More Related Contents:

  1. Make Git automatically remove trailing white space before committing
  2. Add only non-whitespace changes
  3. Coloring white space in git-diff’s output
  4. Merging without whitespace conflicts
  5. What is git’s “filemode”?
  6. Git submodule update
  7. In Git, how can I recover a staged file that was reverted prior to committing?
  8. How to resolve “Error: bad index – Fatal: index file corrupt” when using Git
  9. How to restrict access to the master branch in Git
  10. Push local Git repo to new remote including all branches and tags
  11. Difference between Git and GitHub
  12. How do I prompt the user from within a commit-msg hook?
  13. How to make Git pull use rebase by default for all my repositories?
  14. How do I get bash completion to work with aliases?
  15. How do I get my ‘Detached HEAD’ commits back into master [duplicate]
  16. Fix msysGit Portable $HOME location
  17. Get changes from master into branch in Git
  18. Git Commit Messages: 50/72 Formatting
  19. fatal: This operation must be run in a work tree [duplicate]
  20. How git works when two peers push changes to same remote simultaneously
  21. How do I view a git repo’s receive history?
  22. Get back the changes after accidental checkout?
  23. Rebase feature branch onto another feature branch
  24. How to extract a git subdirectory and make a submodule out of it?
  25. How do you change the capitalization of filenames in Git?
  26. How to make git diff –ignore-space-change the default
  27. How does git log –since count?
  28. Using IntelliJ to amend git commit message
  29. when you have secret key in your project, how can pushing to GitHub be possible?
  30. Other consequences of `git push –force`?

Leave a Comment