Revision 06ff64ae3d8c1d446ff61cff78a8faa3a07bfe24 authored by SZEDER Gábor on 16 June 2008, 22:00:02 UTC, committed by Junio C Hamano on 16 June 2008, 22:22:09 UTC
It worked that way since commit 50f575fc (Tweak diff colors,
2006-06-22), but commit c1795bb0 (Unify whitespace checking, 2007-12-13)
changed it.  This patch restores the old behaviour.

Besides Linus' arguments in the log message of 50f575fc, resetting color
before printing newline is also important to keep 'git add --patch'
happy.  If the last line(s) of a file are removed, then that hunk will
end with a colored line.  However, if the newline comes before the color
reset, then the diff output will have an additional line at the end
containing only the reset sequence.  This causes trouble in
git-add--interactive.perl's parse_diff function, because @colored will
have one more element than @diff, and that last element will contain the
color reset.  The elements of these arrays will then be copied to @hunk,
but only as many as the number of elements in @diff.  As a result the
last color reset is lost and all subsequent terminal output will be
printed in color.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2feaf4e
History
File Mode Size
lib-httpd
t3900
t4013
t4020
t4100
t4101
t5100
t5515
t7004
t7500
t9110
t9111
t9115
t9121
.gitattributes -rw-r--r-- 14 bytes
.gitignore -rw-r--r-- 6 bytes
Makefile -rw-r--r-- 640 bytes
README -rw-r--r-- 6.8 KB
annotate-tests.sh -rw-r--r-- 3.3 KB
diff-lib.sh -rw-r--r-- 1.4 KB
lib-git-svn.sh -rw-r--r-- 2.6 KB
lib-httpd.sh -rw-r--r-- 2.0 KB
lib-read-tree-m-3way.sh -rw-r--r-- 4.1 KB
t0000-basic.sh -rwxr-xr-x 11.7 KB
t0001-init.sh -rwxr-xr-x 2.5 KB
t0003-attributes.sh -rwxr-xr-x 852 bytes
t0004-unwritable.sh -rwxr-xr-x 1019 bytes
t0010-racy-git.sh -rwxr-xr-x 609 bytes
t0020-crlf.sh -rwxr-xr-x 8.6 KB
t0021-conversion.sh -rwxr-xr-x 2.3 KB
t0022-crlf-rename.sh -rwxr-xr-x 560 bytes
t0023-crlf-am.sh -rwxr-xr-x 785 bytes
t0030-stripspace.sh -rwxr-xr-x 12.5 KB
t0040-parse-options.sh -rwxr-xr-x 2.7 KB
t0050-filesystem.sh -rwxr-xr-x 1.6 KB
t1000-read-tree-m-3way.sh -rwxr-xr-x 16.6 KB
t1001-read-tree-m-2way.sh -rwxr-xr-x 10.2 KB
t1002-read-tree-m-u-2way.sh -rwxr-xr-x 11.0 KB
t1003-read-tree-prefix.sh -rwxr-xr-x 412 bytes
t1004-read-tree-m-u-wf.sh -rwxr-xr-x 5.4 KB
t1005-read-tree-reset.sh -rwxr-xr-x 499 bytes
t1020-subdirectory.sh -rwxr-xr-x 2.9 KB
t1100-commit-tree-options.sh -rwxr-xr-x 1.1 KB
t1200-tutorial.sh -rwxr-xr-x 4.0 KB
t1300-repo-config.sh -rwxr-xr-x 13.3 KB
t1301-shared-repo.sh -rwxr-xr-x 602 bytes
t1302-repo-version.sh -rwxr-xr-x 1.2 KB
t1303-wacky-config.sh -rwxr-xr-x 654 bytes
t1400-update-ref.sh -rwxr-xr-x 7.6 KB
t1410-reflog.sh -rwxr-xr-x 3.7 KB
t1420-lost-found.sh -rwxr-xr-x 749 bytes
t1500-rev-parse.sh -rwxr-xr-x 2.0 KB
t1501-worktree.sh -rwxr-xr-x 3.2 KB
t1502-rev-parse-parseopt.sh -rwxr-xr-x 990 bytes
t2000-checkout-cache-clash.sh -rwxr-xr-x 1.2 KB
t2001-checkout-cache-clash.sh -rwxr-xr-x 2.4 KB
t2002-checkout-cache-u.sh -rwxr-xr-x 742 bytes
t2003-checkout-cache-mkdir.sh -rwxr-xr-x 2.5 KB
t2004-checkout-cache-temp.sh -rwxr-xr-x 5.5 KB
t2005-checkout-index-symlinks.sh -rwxr-xr-x 681 bytes
t2007-checkout-symlink.sh -rwxr-xr-x 866 bytes
t2008-checkout-subdir.sh -rwxr-xr-x 1.9 KB
t2009-checkout-statinfo.sh -rwxr-xr-x 921 bytes
t2050-git-dir-relative.sh -rwxr-xr-x 1.3 KB
t2100-update-cache-badpath.sh -rwxr-xr-x 1.0 KB
t2101-update-index-reupdate.sh -rwxr-xr-x 2.1 KB
t2102-update-index-symlinks.sh -rwxr-xr-x 804 bytes
t2200-add-update.sh -rwxr-xr-x 2.2 KB
t2201-add-update-typechange.sh -rwxr-xr-x 2.8 KB
t3000-ls-files-others.sh -rwxr-xr-x 1.1 KB
t3001-ls-files-others-exclude.sh -rwxr-xr-x 2.2 KB
t3002-ls-files-dashpath.sh -rwxr-xr-x 1.2 KB
t3010-ls-files-killed-modified.sh -rwxr-xr-x 2.0 KB
t3020-ls-files-error-unmatch.sh -rwxr-xr-x 652 bytes
t3030-merge-recursive.sh -rwxr-xr-x 10.1 KB
t3040-subprojects-basic.sh -rwxr-xr-x 2.4 KB
t3050-subprojects-fetch.sh -rwxr-xr-x 1.0 KB
t3060-ls-files-with-tree.sh -rwxr-xr-x 1.6 KB
t3100-ls-tree-restrict.sh -rwxr-xr-x 3.6 KB
t3101-ls-tree-dirname.sh -rwxr-xr-x 3.7 KB
t3200-branch.sh -rwxr-xr-x 7.9 KB
t3201-branch-contains.sh -rwxr-xr-x 878 bytes
t3210-pack-refs.sh -rwxr-xr-x 2.7 KB
t3300-funny-names.sh -rwxr-xr-x 4.2 KB
t3400-rebase.sh -rwxr-xr-x 2.2 KB
t3401-rebase-partial.sh -rwxr-xr-x 1.5 KB
t3402-rebase-merge.sh -rwxr-xr-x 2.2 KB
t3403-rebase-skip.sh -rwxr-xr-x 1.7 KB
t3404-rebase-interactive.sh -rwxr-xr-x 8.7 KB
t3405-rebase-malformed.sh -rwxr-xr-x 844 bytes
t3406-rebase-message.sh -rwxr-xr-x 652 bytes
t3407-rebase-abort.sh -rwxr-xr-x 1.7 KB
t3408-rebase-multi-line.sh -rwxr-xr-x 720 bytes
t3500-cherry.sh -rwxr-xr-x 1.5 KB
t3501-revert-cherry-pick.sh -rwxr-xr-x 1.2 KB
t3502-cherry-pick-merge.sh -rwxr-xr-x 2.0 KB
t3600-rm.sh -rwxr-xr-x 5.7 KB
t3700-add.sh -rwxr-xr-x 4.7 KB
t3701-add-interactive.sh -rwxr-xr-x 1.4 KB
t3800-mktag.sh -rwxr-xr-x 7.7 KB
t3900-i18n-commit.sh -rwxr-xr-x 2.5 KB
t3901-8859-1.txt -rwxr-xr-x 153 bytes
t3901-i18n-patch.sh -rwxr-xr-x 6.1 KB
t3901-utf8.txt -rwxr-xr-x 155 bytes
t3902-quoted.sh -rwxr-xr-x 2.5 KB
t3903-stash.sh -rwxr-xr-x 2.4 KB
t4000-diff-format.sh -rwxr-xr-x 1.0 KB
t4001-diff-rename.sh -rwxr-xr-x 1.5 KB
t4002-diff-basic.sh -rwxr-xr-x 14.5 KB
t4003-diff-rename-1.sh -rwxr-xr-x 4.0 KB
t4004-diff-rename-symlink.sh -rwxr-xr-x 1.5 KB
t4005-diff-rename-2.sh -rwxr-xr-x 2.8 KB
t4006-diff-mode.sh -rwxr-xr-x 1001 bytes
t4007-rename-3.sh -rwxr-xr-x 2.7 KB
t4008-diff-break-rewrite.sh -rwxr-xr-x 6.0 KB
t4009-diff-rename-4.sh -rwxr-xr-x 2.8 KB
t4010-diff-pathspec.sh -rwxr-xr-x 1.8 KB
t4011-diff-symlink.sh -rwxr-xr-x 1.7 KB
t4012-diff-binary.sh -rwxr-xr-x 2.2 KB
t4013-diff-various.sh -rwxr-xr-x 7.3 KB
t4014-format-patch.sh -rwxr-xr-x 6.8 KB
t4015-diff-whitespace.sh -rwxr-xr-x 6.3 KB
t4016-diff-quote.sh -rwxr-xr-x 1.8 KB
t4017-diff-retval.sh -rwxr-xr-x 2.3 KB
t4017-quiet.sh -rwxr-xr-x 2.1 KB
t4018-diff-funcname.sh -rwxr-xr-x 1.2 KB
t4019-diff-wserror.sh -rwxr-xr-x 3.6 KB
t4020-diff-external.sh -rwxr-xr-x 2.2 KB
t4021-format-patch-numbered.sh -rwxr-xr-x 1.8 KB
t4021-format-patch-signer-mime.sh -rwxr-xr-x 935 bytes
t4022-diff-rewrite.sh -rwxr-xr-x 477 bytes
t4023-diff-rename-typechange.sh -rwxr-xr-x 1.5 KB
t4024-diff-optimize-common.sh -rwxr-xr-x 2.7 KB
t4025-hunk-header.sh -rwxr-xr-x 665 bytes
t4026-color.sh -rwxr-xr-x 1.2 KB
t4027-diff-submodule.sh -rwxr-xr-x 948 bytes
t4028-format-patch-mime-headers.sh -rwxr-xr-x 727 bytes
t4100-apply-stat.sh -rwxr-xr-x 1.2 KB
t4101-apply-nonl.sh -rwxr-xr-x 548 bytes
t4102-apply-rename.sh -rwxr-xr-x 1.1 KB
t4103-apply-binary.sh -rwxr-xr-x 3.0 KB
t4104-apply-boundary.sh -rwxr-xr-x 2.4 KB
t4105-apply-fuzz.sh -rwxr-xr-x 1.1 KB
t4109-apply-multifrag.sh -rwxr-xr-x 2.7 KB
t4110-apply-scan.sh -rwxr-xr-x 1.3 KB
t4112-apply-renames.sh -rwxr-xr-x 2.8 KB
t4113-apply-ending.sh -rwxr-xr-x 665 bytes
t4114-apply-typechange.sh -rwxr-xr-x 2.5 KB
t4115-apply-symlink.sh -rwxr-xr-x 773 bytes
t4116-apply-reverse.sh -rwxr-xr-x 1.7 KB
t4117-apply-reject.sh -rwxr-xr-x 2.5 KB
t4118-apply-empty-context.sh -rwxr-xr-x 976 bytes
t4119-apply-config.sh -rwxr-xr-x 3.0 KB
t4120-apply-popt.sh -rwxr-xr-x 386 bytes
t4121-apply-diffs.sh -rwxr-xr-x 556 bytes
t4122-apply-symlink-inside.sh -rwxr-xr-x 1011 bytes
t4123-apply-shrink.sh -rwxr-xr-x 617 bytes
t4124-apply-ws-rule.sh -rwxr-xr-x 3.1 KB
t4125-apply-ws-fuzz.sh -rwxr-xr-x 2.2 KB
t4150-am-subdir.sh -rwxr-xr-x 1.3 KB
t4200-rerere.sh -rwxr-xr-x 4.9 KB
t4201-shortlog.sh -rwxr-xr-x 1.6 KB
t4202-log.sh -rwxr-xr-x 1.1 KB
t5000-tar-tree.sh -rwxr-xr-x 5.0 KB
t5100-mailinfo.sh -rwxr-xr-x 584 bytes
t5300-pack-object.sh -rwxr-xr-x 7.3 KB
t5301-sliding-window.sh -rwxr-xr-x 1.7 KB
t5302-pack-index.sh -rwxr-xr-x 5.6 KB
t5303-hash-object.sh -rwxr-xr-x 1.2 KB
t5304-prune.sh -rw-r--r-- 2.6 KB
t5305-include-tag.sh -rwxr-xr-x 1.8 KB
t5400-send-pack.sh -rwxr-xr-x 4.1 KB
t5401-update-hooks.sh -rwxr-xr-x 3.6 KB
t5402-post-merge-hook.sh -rwxr-xr-x 1.5 KB
t5403-post-checkout-hook.sh -rwxr-xr-x 2.5 KB
t5404-tracking-branches.sh -rwxr-xr-x 1.2 KB
t5405-send-pack-rewind.sh -rwxr-xr-x 593 bytes
t5406-remote-rejects.sh -rwxr-xr-x 509 bytes
t5500-fetch-pack.sh -rwxr-xr-x 4.0 KB
t5502-quickfetch.sh -rwxr-xr-x 2.1 KB
t5503-tagfollow.sh -rwxr-xr-x 2.9 KB
t5505-remote.sh -rwxr-xr-x 5.5 KB
t5510-fetch.sh -rwxr-xr-x 6.4 KB
t5511-refspec.sh -rwxr-xr-x 2.4 KB
t5512-ls-remote.sh -rwxr-xr-x 825 bytes
t5515-fetch-merge-logic.sh -rwxr-xr-x 4.4 KB
t5516-fetch-push.sh -rwxr-xr-x 9.3 KB
t5517-push-mirror.sh -rwxr-xr-x 5.5 KB
t5520-pull.sh -rwxr-xr-x 2.0 KB
t5530-upload-pack-error.sh -rwxr-xr-x 1.3 KB
t5540-http-push.sh -rwxr-xr-x 1.3 KB
t5600-clone-fail-cleanup.sh -rwxr-xr-x 1.1 KB
t5601-clone.sh -rwxr-xr-x 314 bytes
t5700-clone-reference.sh -rwxr-xr-x 2.4 KB
t5701-clone-local.sh -rwxr-xr-x 2.3 KB
t5702-clone-options.sh -rwxr-xr-x 351 bytes
t5710-info-alternate.sh -rwxr-xr-x 2.3 KB
t6000lib.sh -rwxr-xr-x 2.5 KB
t6001-rev-list-graft.sh -rwxr-xr-x 2.3 KB
t6002-rev-list-bisect.sh -rwxr-xr-x 8.2 KB
t6003-rev-list-topo-order.sh -rwxr-xr-x 8.5 KB
t6004-rev-list-path-optim.sh -rwxr-xr-x 1.2 KB
t6005-rev-list-count.sh -rwxr-xr-x 1.7 KB
t6006-rev-list-format.sh -rwxr-xr-x 3.8 KB
t6007-rev-list-cherry-pick-file.sh -rwxr-xr-x 1.2 KB
t6008-rev-list-submodule.sh -rwxr-xr-x 805 bytes
t6009-rev-list-parent.sh -rwxr-xr-x 531 bytes
t6010-merge-base.sh -rwxr-xr-x 2.5 KB
t6020-merge-df.sh -rwxr-xr-x 528 bytes
t6021-merge-criss-cross.sh -rwxr-xr-x 1.2 KB
t6022-merge-rename.sh -rwxr-xr-x 7.9 KB
t6023-merge-file.sh -rwxr-xr-x 4.2 KB
t6023-merge-rename-nocruft.sh -rwxr-xr-x 3.6 KB
t6024-recursive-merge.sh -rwxr-xr-x 2.3 KB
t6025-merge-symlinks.sh -rwxr-xr-x 1.5 KB
t6026-merge-attr.sh -rwxr-xr-x 2.7 KB
t6027-merge-binary.sh -rwxr-xr-x 1.1 KB
t6028-merge-up-to-date.sh -rwxr-xr-x 1.4 KB
t6029-merge-subtree.sh -rwxr-xr-x 1.7 KB
t6030-bisect-porcelain.sh -rwxr-xr-x 8.9 KB
t6031-merge-recursive.sh -rwxr-xr-x 1002 bytes
t6101-rev-parse-parents.sh -rwxr-xr-x 1.8 KB
t6120-describe.sh -rwxr-xr-x 3.0 KB
t6200-fmt-merge-msg.sh -rwxr-xr-x 2.5 KB
t6300-for-each-ref.sh -rwxr-xr-x 6.4 KB
t7001-mv.sh -rwxr-xr-x 3.6 KB
t7002-grep.sh -rwxr-xr-x 2.0 KB
t7003-filter-branch.sh -rwxr-xr-x 5.1 KB
t7004-tag.sh -rwxr-xr-x 28.8 KB
t7005-editor.sh -rwxr-xr-x 2.1 KB
t7010-setup.sh -rwxr-xr-x 2.7 KB
t7101-reset.sh -rwxr-xr-x 1.4 KB
t7102-reset.sh -rwxr-xr-x 9.9 KB
t7103-reset-bare.sh -rwxr-xr-x 525 bytes
t7104-reset.sh -rwxr-xr-x 825 bytes
t7201-co.sh -rwxr-xr-x 7.2 KB
t7300-clean.sh -rwxr-xr-x 7.6 KB
t7400-submodule-basic.sh -rwxr-xr-x 4.6 KB
t7401-submodule-summary.sh -rwxr-xr-x 3.4 KB
t7500-commit.sh -rwxr-xr-x 3.7 KB
t7501-commit.sh -rwxr-xr-x 7.6 KB
t7502-commit.sh -rwxr-xr-x 4.2 KB
t7502-status.sh -rwxr-xr-x 2.7 KB
t7503-pre-commit-hook.sh -rwxr-xr-x 1.3 KB
t7504-commit-msg-hook.sh -rwxr-xr-x 4.0 KB
t7505-prepare-commit-msg-hook.sh -rwxr-xr-x 3.0 KB
t7600-merge.sh -rwxr-xr-x 7.6 KB
t7610-mergetool.sh -rw-r--r-- 1.3 KB
t8001-annotate.sh -rwxr-xr-x 343 bytes
t8002-blame.sh -rwxr-xr-x 111 bytes
t8003-blame.sh -rwxr-xr-x 2.1 KB
t8004-blame.sh -rwxr-xr-x 1.5 KB
t9001-send-email.sh -rwxr-xr-x 6.0 KB
t9100-git-svn-basic.sh -rwxr-xr-x 7.5 KB
t9101-git-svn-props.sh -rwxr-xr-x 5.7 KB
t9102-git-svn-deep-rmdir.sh -rwxr-xr-x 783 bytes
t9103-git-svn-tracked-directory-removed.sh -rwxr-xr-x 892 bytes
t9104-git-svn-follow-parent.sh -rwxr-xr-x 6.0 KB
t9105-git-svn-commit-diff.sh -rwxr-xr-x 1.1 KB
t9106-git-svn-commit-diff-clobber.sh -rwxr-xr-x 2.5 KB
t9106-git-svn-dcommit-clobber-series.sh -rwxr-xr-x 1.7 KB
t9107-git-svn-migrate.sh -rwxr-xr-x 4.4 KB
t9108-git-svn-glob.sh -rwxr-xr-x 2.9 KB
t9110-git-svn-use-svm-props.sh -rwxr-xr-x 1.6 KB
t9111-git-svn-use-svnsync-props.sh -rwxr-xr-x 1.6 KB
t9112-git-svn-md5less-file.sh -rwxr-xr-x 918 bytes
t9113-git-svn-dcommit-new-file.sh -rwxr-xr-x 1.0 KB
t9114-git-svn-dcommit-merge.sh -rwxr-xr-x 2.6 KB
t9115-git-svn-dcommit-funky-renames.sh -rwxr-xr-x 1.3 KB
t9116-git-svn-log.sh -rwxr-xr-x 3.9 KB
t9117-git-svn-init-clone.sh -rwxr-xr-x 1.2 KB
t9118-git-svn-funky-branch-names.sh -rwxr-xr-x 1.0 KB
t9119-git-svn-info.sh -rwxr-xr-x 11.5 KB
t9120-git-svn-clone-with-percent-escapes.sh -rwxr-xr-x 683 bytes
t9121-git-svn-fetch-renamed-dir.sh -rwxr-xr-x 372 bytes
t9200-git-cvsexportcommit.sh -rwxr-xr-x 9.2 KB
t9300-fast-import.sh -rwxr-xr-x 20.5 KB
t9301-fast-export.sh -rwxr-xr-x 2.6 KB
t9400-git-cvsserver-server.sh -rwxr-xr-x 13.2 KB
t9500-gitweb-standalone-no-errors.sh -rwxr-xr-x 16.9 KB
t9600-cvsimport.sh -rwxr-xr-x 2.4 KB
test-lib.sh -rw-r--r-- 8.8 KB
test4012.png -rw-r--r-- 5.5 KB
test9200a.png -rw-r--r-- 5.5 KB
test9200b.png -rw-r--r-- 275 bytes

README

back to top