Re: [PATCH] Add gitattributes file making whitespace checking pickier
- From
- J. Bruce Fields <bfields@fieldses.org>
- Date
- Feb 9, 2008, 18:50 UTC
- Message-ID
- <20080209185038.GB25533@fieldses.org>
- In-Reply-To
- <alpine.LNX.1.00.0802091251430.13593@iabervon.org>
On Sat, Feb 09, 2008 at 12:56:16PM -0500, Daniel Barkalow wrote:
Show 15 quoted lines
> On Sat, 9 Feb 2008, J. Bruce Fields wrote: > > > From: J. Bruce Fields <bfields@citi.umich.edu> > > > > This will change the notion of "bad" whitespace for the git project to > > include initial whitespace that uses spaces where tabs could have been > > used. > > > > This only changes which whitespace is considered "bad". It doesn't > > change the behavior when bad whitespace is found. By default, commands > > like git-apply, git-am, and git-rebase will print a warning but > > otherwise do nothing. > > I think there are files under t/ with different whitespace rules. For > example, expected format-patch output will have lines that are: "-- "
Well, this change doesn't actually affect that case.
> While you're putting in attributes in general, it'd be nice to take care > of all of the cases already in the tree.
Yeah, fair enough. Hard to know where to start, though. OK, just to get an idea, I committed a completely empty tree, made a diff (with --binary), then applied with --whitespace=fix and compared to the original. In some cases these seem to be accidental, in some cases (git-p4) I assume they're intended to use the different style.
--b.
COPYING | 2 Documentation/RelNotes-1.5.3.8.txt | 1 Documentation/SubmittingPatches | 30 Documentation/callouts.xsl | 2 Documentation/config.txt | 2 Documentation/core-tutorial.txt | 56 Documentation/diff-format.txt | 8 Documentation/everyday.txt | 20 Documentation/git-add.txt | 14 Documentation/git-am.txt | 6 Documentation/git-archimport.txt | 2 Documentation/git-bisect.txt | 6 Documentation/git-blame.txt | 4 Documentation/git-cherry.txt | 12 Documentation/git-cvsimport.txt | 4 Documentation/git-cvsserver.txt | 10 Documentation/git-daemon.txt | 10 Documentation/git-diff-tree.txt | 2 Documentation/git-for-each-ref.txt | 4 Documentation/git-format-patch.txt | 22 Documentation/git-http-fetch.txt | 8 Documentation/git-index-pack.txt | 2 Documentation/git-instaweb.txt | 2 Documentation/git-ls-files.txt | 2 Documentation/git-ls-tree.txt | 4 Documentation/git-mv.txt | 6 Documentation/git-pack-objects.txt | 4 Documentation/git-prune-packed.txt | 4 Documentation/git-push.txt | 2 Documentation/git-read-tree.txt | 14 Documentation/git-rebase.txt | 56 Documentation/git-repack.txt | 10 Documentation/git-rerere.txt | 20 Documentation/git-rev-parse.txt | 14 Documentation/git-rm.txt | 8 Documentation/git-send-email.txt | 14 Documentation/git-show-branch.txt | 8 Documentation/git-stash.txt | 4 Documentation/git-unpack-objects.txt | 2 Documentation/git-update-index.txt | 18 Documentation/git.txt | 4 Documentation/howto/maintain-git.txt | 14 Documentation/howto/rebase-from-internal-branch.txt | 20 Documentation/howto/rebuild-from-update-hook.txt | 4 Documentation/howto/revert-branch-rebase.txt | 2 Documentation/howto/separating-topic-branches.txt | 86 Documentation/howto/update-hook-example.txt | 56 Documentation/rev-list-options.txt | 10 Documentation/technical/pack-format.txt | 16 Documentation/technical/pack-heuristics.txt | 340 - Documentation/technical/send-pack-pipeline.txt | 8 Documentation/user-manual.txt | 130 GIT-VERSION-GEN | 2 INSTALL | 4 Makefile | 7 archive-tar.c | 18 archive-zip.c | 12 archive.c | 17 blob.c | 24 builtin-add.c | 4 builtin-apply.c | 6 builtin-fetch-pack.c | 2 builtin-fetch.c | 4 builtin-for-each-ref.c | 10 builtin-fsck.c | 4 builtin-init-db.c | 2 builtin-log.c | 2 builtin-ls-tree.c | 6 builtin-pack-objects.c | 8 builtin-rev-parse.c | 4 cache-tree.c | 2 commit.h | 8 compat/inet_pton.c | 242 compat/memmem.c | 2 compat/pread.c | 18 compat/unsetenv.c | 2 configure.ac | 4 contrib/completion/git-completion.bash | 4 contrib/emacs/git-blame.el | 194 contrib/emacs/git.el | 678 +- contrib/emacs/vc-git.el | 58 contrib/examples/git-commit.sh | 2 contrib/examples/git-fetch.sh | 2 contrib/examples/git-svnimport.txt | 6 contrib/examples/git-tag.sh | 16 contrib/fast-import/git-p4 | 2718 +++++----- contrib/fast-import/git-p4.txt | 1 contrib/gitview/gitview | 6 contrib/hg-to-git/hg-to-git.py | 110 contrib/hg-to-git/hg-to-git.txt | 4 contrib/p4import/git-p4import.py | 358 - contrib/p4import/git-p4import.txt | 12 contrib/stats/mailmap.pl | 1 contrib/stats/packinfo.pl | 58 convert.c | 10 diff.h | 2 fast-import.c | 18 generate-cmdlist.sh | 4 git-add--interactive.perl | 4 git-am.sh | 8 git-archimport.perl | 702 +- git-bisect.sh | 36 git-compat-util.h | 2 git-cvsexportcommit.perl | 14 git-cvsimport.perl | 24 git-cvsserver.perl | 2346 ++++---- git-filter-branch.sh | 2 git-gui/po/fr.po | 1 git-gui/po/glossary/fr.po | 1 git-gui/po/glossary/git-gui-glossary.pot | 1 git-gui/po/it.po | 4 git-gui/po/sv.po | 1 git-help--browse.sh | 2 git-merge.sh | 18 git-mergetool.sh | 36 git-parse-remote.sh | 2 git-rebase.sh | 2 git-remote.perl | 4 git-send-email.perl | 26 git-svn.perl | 336 - gitk-git/Makefile | 1 gitk-git/gitk | 52 gitweb/gitweb.perl | 566 +- index-pack.c | 30 object.c | 8 parse-options.c | 12 parse-options.h | 6 patch-ids.c | 2 perl/Git.pm | 10 perl/private-Error.pm | 40 ppc/sha1ppc.S | 2 pretty.c | 24 quote.c | 4 quote.h | 2 refs.c | 2 remote.c | 4 revision.c | 4 sha1_file.c | 10 strbuf.c | 2 strbuf.h | 2 t/lib-read-tree-m-3way.sh | 4 t/t0040-parse-options.sh | 2 t/t1000-read-tree-m-3way.sh | 12 t/t1001-read-tree-m-2way.sh | 10 t/t1300-repo-config.sh | 2 t/t3040-subprojects-basic.sh | 2 t/t3200-branch.sh | 30 t/t3600-rm.sh | 4 t/t4010-diff-pathspec.sh | 4 t/t4013/diff.format-patch_--stdout_initial..master | 6 t/t4013/diff.format-patch_--stdout_initial..master^ | 4 t/t4013/diff.format-patch_--stdout_initial..side | 2 t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ | 2 t/t4013/diff.log_--patch-with-stat_master | 2 t/t4013/diff.log_--patch-with-stat_master_--_dir_ | 2 t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master | 2 t/t4013/diff.log_--root_--patch-with-stat_--summary_master | 2 t/t4013/diff.log_--root_--patch-with-stat_master | 2 t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master | 2 t/t4013/diff.log_--root_-p_master | 2 t/t4013/diff.log_--root_master | 2 t/t4013/diff.log_-p_master | 2 t/t4013/diff.log_master | 2 t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ | 2 t/t4013/diff.whatchanged_--patch-with-stat_master | 2 t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ | 2 t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master | 2 t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master | 2 t/t4013/diff.whatchanged_--root_--patch-with-stat_master | 2 t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master | 2 t/t4013/diff.whatchanged_--root_-p_master | 2 t/t4013/diff.whatchanged_--root_master | 2 t/t4013/diff.whatchanged_-p_master | 2 t/t4013/diff.whatchanged_master | 2 t/t4015-diff-whitespace.sh | 4 t/t4016-diff-quote.sh | 14 t/t4021-format-patch-signer-mime.sh | 1 t/t4022-diff-rewrite.sh | 1 t/t4100/t-apply-1.patch | 156 t/t4100/t-apply-2.patch | 16 t/t4100/t-apply-3.expect | 6 t/t4100/t-apply-3.patch | 60 t/t4100/t-apply-4.expect | 4 t/t4100/t-apply-5.patch | 58 t/t4100/t-apply-6.patch | 14 t/t4100/t-apply-7.expect | 6 t/t4100/t-apply-7.patch | 136 t/t4101-apply-nonl.sh | 2 t/t4109-apply-multifrag.sh | 63 t/t4119-apply-config.sh | 2 t/t4201-shortlog.sh | 8 t/t5100/info0001 | 1 t/t5100/info0002 | 1 t/t5100/info0003 | 1 t/t5100/info0004 | 1 t/t5100/info0005 | 1 t/t5100/info0006 | 1 t/t5100/info0007 | 1 t/t5100/info0008 | 1 t/t5100/msg0001 | 1 t/t5100/msg0002 | 5 t/t5100/msg0003 | 1 t/t5100/msg0004 | 1 t/t5100/msg0006 | 1 t/t5100/msg0007 | 1 t/t5100/msg0008 | 1 t/t5100/patch0001 | 3 t/t5100/patch0002 | 3 t/t5100/patch0003 | 3 t/t5100/patch0004 | 28 t/t5100/patch0005 | 50 t/t5100/patch0006 | 3 t/t5100/sample.mbox | 82 t/t5300-pack-object.sh | 6 t/t5301-sliding-window.sh | 6 t/t5302-pack-index.sh | 6 t/t5400-send-pack.sh | 6 t/t5402-post-merge-hook.sh | 12 t/t5403-post-checkout-hook.sh | 52 t/t6000lib.sh | 16 t/t6002-rev-list-bisect.sh | 2 t/t6005-rev-list-count.sh | 6 t/t6030-bisect-porcelain.sh | 10 t/t6120-describe.sh | 8 t/t7002-grep.sh | 2 t/t7003-filter-branch.sh | 2 t/t7500-commit.sh | 2 t/t9100-git-svn-basic.sh | 26 t/t9104-git-svn-follow-parent.sh | 108 t/t9107-git-svn-migrate.sh | 16 t/t9108-git-svn-glob.sh | 10 t/t9110/svm.dump | 6 t/t9113-git-svn-dcommit-new-file.sh | 6 t/t9116-git-svn-log.sh | 2 t/t9118-git-svn-funky-branch-names.sh | 4 t/t9400-git-cvsserver-server.sh | 6 t/t9500-gitweb-standalone-no-errors.sh | 4 tag.c | 18 test-chmtime.c | 4 transport.c | 4 utf8.c | 4 wt-status.c | 4 xdiff/xemit.c | 2 243 files changed, 5666 insertions(+), 5702 deletions(-)