Jeff King 2c1acdf6c9 Revert "color: make "always" the same as "auto" in config" ... This reverts commit 6be4595edb. That commit weakened the "always" setting of color config so that it acted as "auto". This was meant to solve regressions in v2.14.2 in which setting "color.ui=always" in the on-disk config broke scripts like add--interactive, because the plumbing diff commands began to generate color output. This was due to 136c8c8b8f (color: check color.ui in git_default_config(), 2017-07-13), which was in turn trying to fix issues caused by 4c7f1819b3 (make color.ui default to 'auto', 2013-06-10). But in weakening "always", we created even more problems, as people expect to be able to use "git -c color.ui=always" to force color (especially because some commands don't have their own --color flag). We can fix that by special-casing the command-line "-c", but now things are getting pretty confusing. Instead of piling hacks upon hacks, let's start peeling off the hacks. The first step is dropping the weakening of "always", which this revert does. Note that we could actually revert the whole series merged in by da15b78e52. Most of that series consists of preparations to the tests to handle the weakening of "-c color.ui=always". But it's worth keeping for a few reasons: - there are some other preparatory cleanups, like e433749d86 (test-terminal: set TERM=vt100, 2017-10-03) - it adds "--color" options more consistently in 0c88bf5050 (provide --color option for all ref-filter users, 2017-10-03) - some of the cases dropping "-c" end up being more robust and realistic tests, as in 01c94e9001 (t7508: use test_terminal for color output, 2017-10-03) - the preferred tool for overriding config is "--color", and we should be modeling that consistently We can individually revert the few commits necessary to restore some useful tests (which will be done on top of this patch). Note that this isn't a pure revert; we'll keep the test added in t3701, but mark it as failure for now. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2017-10-17 15:08:51 +09:00
..
howto	doc: use https links to avoid http redirect	2017-04-20 22:05:37 -07:00
RelNotes	Git 2.14.2	2017-09-22 14:51:37 +09:00
technical	Merge branch 'ma/pager-per-subcommand-action' into maint	2017-09-10 17:02:48 +09:00
.gitattributes
.gitignore
asciidoc.conf
asciidoctor-extensions.rb	Documentation: implement linkgit macro for Asciidoctor	2017-01-31 12:18:18 -08:00
blame-options.txt	Merge branch 'bc/blame-doc-fix'	2017-02-24 10:48:08 -08:00
build-docdep.perl
cat-texi.perl	Documentation: remove unneeded argument in cat-texi.perl	2017-01-23 10:56:47 -08:00
cmd-list.perl
CodingGuidelines	Merge branch 'ab/c-translators-comment-style' into maint	2017-06-05 09:03:10 +09:00
config.txt	Revert "color: make "always" the same as "auto" in config"	2017-10-17 15:08:51 +09:00
date-formats.txt	Merge branch 'lr/doc-fix-cet' into maint	2017-01-17 15:19:08 -08:00
diff-config.txt	doc: add missing values "none" and "default" for diff.wsErrorHighlight	2017-07-25 14:30:49 -07:00
diff-format.txt	Documentation: improve description for core.quotePath	2017-03-02 11:40:51 -08:00
diff-generate-patch.txt	Documentation: improve description for core.quotePath	2017-03-02 11:40:51 -08:00
diff-heuristic-options.txt	diff: retire "compaction" heuristics	2016-12-23 12:32:22 -08:00
diff-options.txt	Merge branch 'ah/doc-wserrorhighlight' into maint	2017-08-23 14:33:51 -07:00
docbook-xsl.css
docbook.xsl
everyday.txto
fetch-options.txt	Merge branch 'nd/shallow-deepen'	2016-10-10 14:03:50 -07:00
fix-texi.perl
fmt-merge-msg-config.txt
git-add.txt	add: warn when adding an embedded repository	2017-06-15 09:10:44 -07:00
git-am.txt
git-annotate.txt	blame: honor the diff heuristic options and config	2016-09-19 10:25:11 -07:00
git-apply.txt	Documentation: improve description for core.quotePath	2017-03-02 11:40:51 -08:00
git-archimport.txt	docs/archimport: quote sourcecontrol.net reference	2017-04-20 22:05:38 -07:00
git-archive.txt
git-bisect-lk2009.txt	doc: replace more gmane links	2017-05-09 21:13:13 -07:00
git-bisect.txt	git-bisect.txt: add missing word	2017-04-01 11:35:45 -07:00
git-blame.txt	Merge branch 'jc/blame-reverse'	2016-10-10 14:03:51 -07:00
git-branch.txt	Documentation: use proper wording for ref format strings	2017-08-18 09:54:09 -07:00
git-bundle.txt
git-cat-file.txt	cat-file: support --textconv/--filters in batch mode	2016-09-11 14:48:15 -07:00
git-check-attr.txt
git-check-ignore.txt
git-check-mailmap.txt
git-check-ref-format.txt	git-check-ref-format: clarify documentation for --normalize	2017-02-21 13:02:42 -08:00
git-checkout-index.txt
git-checkout.txt	builtin/checkout: add --recurse-submodules switch	2017-03-16 14:07:16 -07:00
git-cherry-pick.txt
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt	clone: add a --no-tags option to clone without tags	2017-05-01 11:09:44 +09:00
git-column.txt
git-commit-tree.txt
git-commit.txt	doc: reformat the paragraph containing the 'cut-line'	2017-07-18 15:04:49 -07:00
git-config.txt	Merge branch 'dg/document-git-c-in-git-config-doc' into maint	2016-09-08 21:35:56 -07:00
git-count-objects.txt	count-objects: report alternates via verbose mode	2016-10-10 13:52:37 -07:00
git-credential-cache--daemon.txt
git-credential-cache.txt	credential-cache: use XDG_CACHE_HOME for socket	2017-03-17 11:19:40 -07:00
git-credential-store.txt
git-credential.txt
git-cvsexportcommit.txt
git-cvsimport.txt	Merge branch 'jk/doc-cvs-update' into maint	2016-10-03 13:22:25 -07:00
git-cvsserver.txt
git-daemon.txt
git-describe.txt	builtin/describe: introduce --broken flag	2017-03-22 10:13:41 -07:00
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt	diff-files: document --ours etc.	2017-04-13 16:15:25 -07:00
git-difftool.txt	Document the --no-gui option in difftool	2017-02-08 13:30:28 -08:00
git-fast-export.txt
git-fast-import.txt	fast-import: increase the default pack depth to 50	2017-06-12 09:50:33 -07:00
git-fetch-pack.txt	upload-pack: optionally allow fetching any sha1	2016-11-18 13:06:14 -08:00
git-fetch.txt	Merge branch 'mm/push-social-engineering-attack-doc' into maint	2017-01-17 15:19:10 -08:00
git-filter-branch.txt	filter-branch: add --setup step	2017-06-12 09:44:54 -07:00
git-fmt-merge-msg.txt	Documentation/fmt-merge-msg: fix markup in example	2016-10-28 05:51:51 -07:00
git-for-each-ref.txt	Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filter-colors-fix-maint	2017-10-17 15:08:31 +09:00
git-format-patch.txt	Merge branch 'xy/format-patch-base'	2017-04-23 22:07:55 -07:00
git-fsck-objects.txt
git-fsck.txt
git-gc.txt	docs/git-gc: fix default value for --aggressiveDepth	2017-02-24 09:59:12 -08:00
git-get-tar-commit-id.txt
git-grep.txt	grep & rev-list doc: stop promising libpcre for --perl-regexp	2017-05-21 08:25:37 +09:00
git-gui.txt	doc: git-gui browser does not default to HEAD	2017-01-13 12:23:28 -08:00
git-hash-object.txt
git-help.txt
git-http-backend.txt
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt
git-index-pack.txt	index-pack: add --max-input-size=<size> option	2016-08-24 12:31:05 -07:00
git-init-db.txt
git-init.txt	init: document dotfiles exclusion on template copy	2017-02-17 15:57:21 -08:00
git-instaweb.txt
git-interpret-trailers.txt	Documentation: fix reference to ifExists for interpret-trailers	2017-05-23 14:18:26 +09:00
git-log.txt
git-ls-files.txt	Merge branch 'mm/ls-files-s-doc'	2017-04-16 23:29:30 -07:00
git-ls-remote.txt
git-ls-tree.txt	Documentation: improve description for core.quotePath	2017-03-02 11:40:51 -08:00
git-mailinfo.txt
git-mailsplit.txt
git-merge-base.txt	doc: fix merge-base ASCII art tab spacing	2016-10-21 09:46:48 -07:00
git-merge-file.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	Documentation/git-merge: explain --continue	2017-08-21 17:12:44 -07:00
git-mergetool--lib.txt
git-mergetool.txt	mergetool: honor -O<orderfile>	2016-10-11 10:04:31 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt	name-rev: add support to exclude refs by pattern match	2017-01-23 18:33:17 -08:00
git-notes.txt
git-p4.txt	Merge branch 'ls/p4-retry-thrice'	2017-01-18 15:12:12 -08:00
git-pack-objects.txt	Doc: clarify that pack-objects makes packs, plural	2017-08-23 10:39:41 -07:00
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt	doc: remove unsupported parameter from patch-id	2017-07-28 14:41:32 -07:00
git-prune-packed.txt
git-prune.txt
git-pull.txt	Merge branch 'sb/pull-rebase-submodule'	2017-07-13 16:14:54 -07:00
git-push.txt	push: document & test --force-with-lease with multiple remotes	2017-04-19 18:53:06 -07:00
git-quiltimport.txt
git-read-tree.txt	Merge branch 'ja/do-not-ask-needless-questions' into maint	2017-06-04 10:20:59 +09:00
git-rebase.txt	Merge branch 'ks/fix-rebase-doc-picture' into maint	2017-07-21 15:03:39 -07:00
git-receive-pack.txt	refs: reject ref updates while GIT_QUARANTINE_PATH is set	2017-04-16 18:19:18 -07:00
git-reflog.txt
git-remote-ext.txt
git-remote-fd.txt	Spelling fixes	2016-08-11 14:35:42 -07:00
git-remote-helpers.txto
git-remote-testgit.txt
git-remote.txt
git-repack.txt	repack: accept --threads=<n> and pass it down to pack-objects	2017-04-27 08:09:25 +09:00
git-replace.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt	Spelling fixes	2017-06-27 10:35:49 -07:00
git-rev-list.txt
git-rev-parse.txt	doc: rewrite description for rev-parse --short	2017-06-01 10:37:42 +09:00
git-revert.txt
git-rm.txt	Merge branch 'sb/submodule-doc'	2017-07-12 15:18:21 -07:00
git-send-email.txt	Merge branch 'xz/send-email-batch-size'	2017-07-06 18:14:46 -07:00
git-send-pack.txt	remote-curl: allow push options	2017-03-22 15:41:21 -07:00
git-sh-i18n--envsubst.txt
git-sh-i18n.txt
git-sh-setup.txt
git-shell.txt	shell: drop git-cvsserver support by default	2017-09-12 11:05:58 +09:00
git-shortlog.txt	shortlog: test and document --committer option	2016-12-16 09:39:10 -08:00
git-show-branch.txt
git-show-index.txt
git-show-ref.txt
git-show.txt
git-stage.txt
git-stash.txt	stash: update documentation to use 'stash entry'	2017-06-18 22:16:36 -07:00
git-status.txt	status: add optional stash count information	2017-06-18 22:17:47 -07:00
git-stripspace.txt
git-submodule.txt	Merge branch 'sb/submodule-doc'	2017-07-12 15:18:21 -07:00
git-svn.txt	git-svn: document special options for commit-diff	2017-06-15 01:09:31 +00:00
git-symbolic-ref.txt
git-tag.txt	Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filter-colors-fix-maint	2017-10-17 15:08:31 +09:00
git-tools.txt	doc: replace or.cz gitwiki link with git.wiki.kernel.org	2017-04-20 22:05:37 -07:00
git-unpack-file.txt
git-unpack-objects.txt	unpack-objects: add --max-input-size=<size> option	2016-08-24 12:31:05 -07:00
git-update-index.txt	Documentation/git-update-index: explain splitIndex.*	2017-03-06 12:09:28 -08:00
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-commit.txt
git-verify-pack.txt
git-verify-tag.txt	builtin/verify-tag: add --format to verify-tag	2017-01-17 16:10:22 -08:00
git-web--browse.txt
git-whatchanged.txt
git-worktree.txt	worktree add: add --lock option	2017-04-20 17:59:02 -07:00
git-write-tree.txt
git.txt	Merge branch 'ah/doc-empty-string-is-false' into maint	2017-09-10 17:03:03 +09:00
gitattributes.txt	Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake	2017-07-26 12:56:19 -07:00
gitcli.txt	stash: update documentation to use 'stash entry'	2017-06-18 22:16:36 -07:00
gitcore-tutorial.txt	gitcore-tutorial: update broken link	2017-04-20 22:05:38 -07:00
gitcredentials.txt	credential doc: make multiple-helper behavior more prominent	2017-05-02 10:58:06 +09:00
gitcvs-migration.txt	Merge branch 'sb/doc-unify-bottom'	2017-02-15 12:54:20 -08:00
gitdiffcore.txt	docs/diffcore: unquote "Complete Rewrites" in headers	2017-02-28 11:34:38 -08:00
giteveryday.txt	giteveryday: unbreak rendering with AsciiDoctor	2017-01-07 14:03:40 -08:00
gitglossary.txt	Documentation: unify bottom "part of git suite" lines	2017-02-09 15:14:01 -08:00
githooks.txt	send-email: support validate hook	2017-05-16 11:13:00 +09:00
gitignore.txt
gitk.txt	Merge branch 'sb/remove-gitview'	2017-01-18 15:12:18 -08:00
gitmodules.txt	Merge branch 'ss/submodule-shallow-doc'	2017-04-26 15:39:07 +09:00
gitnamespaces.txt	doc: mention transfer data leaks in more places	2016-11-14 11:23:07 -08:00
gitremote-helpers.txt	fix minor typos	2017-05-01 11:01:52 +09:00
gitrepository-layout.txt	Merge branch 'sb/doc-unify-bottom'	2017-02-15 12:54:20 -08:00
gitrevisions.txt	doc: gitrevisions - clarify 'latter case' is revision walk	2016-08-13 19:36:44 -07:00
gitsubmodules.txt	submodules: overhaul documentation	2017-06-22 15:25:25 -07:00
gittutorial-2.txt	Documentation: unify bottom "part of git suite" lines	2017-02-09 15:14:01 -08:00
gittutorial.txt	Documentation: unify bottom "part of git suite" lines	2017-02-09 15:14:01 -08:00
gitweb.conf.txt	doc: use https links to avoid http redirect	2017-04-20 22:05:37 -07:00
gitweb.txt	doc: use https links to Wikipedia to avoid http redirects	2017-05-15 13:04:54 +09:00
gitworkflows.txt	Documentation: unify bottom "part of git suite" lines	2017-02-09 15:14:01 -08:00
glossary-content.txt	glossary: define 'stash entry'	2017-06-18 22:18:15 -07:00
howto-index.sh
i18n.txt	doc: camelCase the i18n config variables to improve readability	2017-07-17 15:11:26 -07:00
install-doc-quick.sh
install-webdoc.sh
line-range-format.txt
lint-gitlink.perl
mailmap.txt
Makefile	submodules: overhaul documentation	2017-06-22 15:25:25 -07:00
manpage-1.72.xsl
manpage-base-url.xsl.in
manpage-base.xsl
manpage-bold-literal.xsl
manpage-normal.xsl
manpage-quote-apos.xsl
manpage-suppress-sp.xsl
merge-config.txt
merge-options.txt
merge-strategies.txt
pretty-formats.txt	pretty: respect color settings for %C placeholders	2017-07-13 12:42:51 -07:00
pretty-options.txt
pull-fetch-param.txt
rev-list-options.txt	Merge branch 'rs/strbuf-addftime-zZ'	2017-06-22 14:15:25 -07:00
revisions.txt	Merge branch 'vn/revision-shorthand-for-side-branch-log'	2017-04-19 21:37:25 -07:00
sequencer.txt
SubmittingPatches	Merge branch 'rg/doc-submittingpatches-wordfix'	2017-05-04 16:26:46 +09:00
texi.xsl	Documentation: add XSLT to fix DocBook for Texinfo	2017-01-23 10:56:53 -08:00
transfer-data-leaks.txt	doc: mention transfer data leaks in more places	2016-11-14 11:23:07 -08:00
urls-remotes.txt
urls.txt
user-manual.conf
user-manual.txt	asciidoctor: fix user-manual to be built by asciidoctor	2017-01-13 10:30:16 -08:00