* [PATCH v5 1/5] doc: move author and committer information to git-commit(1)
2020-01-22 3:45 [PATCH v5 0/5] Documentation for common user misconceptions brian m. carlson
@ 2020-01-22 3:45 ` brian m. carlson
2020-01-22 3:45 ` [PATCH v5 2/5] docs: expand on possible and recommended user config options brian m. carlson
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: brian m. carlson @ 2020-01-22 3:45 UTC (permalink / raw)
To: git; +Cc: Jeff King, Junio C Hamano
While at one time it made perfect sense to store information about
configuring author and committer information in the documentation for
git commit-tree, in modern Git that operation is seldom used. Most
users will use git commit and expect to find comprehensive documentation
about its use in the manual page for that command.
Considering that there is significant confusion about how one is to use
the user.name and user.email variables, let's put as much documentation
as possible into an obvious place where users will be more likely to
find it.
In addition, expand the environment variables section to describe their
use more fully. Even though we now describe all of the options there
and in the configuration settings documentation, preserve the existing
text in git-commit.txt so that people can easily reason about the
ordering of the various options they can use. Explain the use of the
author.* and committer.* options as well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
Documentation/config/user.txt | 2 +-
Documentation/git-commit-tree.txt | 22 +---------------------
Documentation/git-commit.txt | 27 ++++++++++++++++++++++++---
Documentation/git.txt | 27 +++++++++++++++++++++++++--
4 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index 0557cbbceb..a1f80e823c 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -13,7 +13,7 @@ committer.email::
Also, all of these can be overridden by the `GIT_AUTHOR_NAME`,
`GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,
`GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.
- See linkgit:git-commit-tree[1] for more information.
+ See linkgit:git-commit[1] for more information.
user.useConfigOnly::
Instruct Git to avoid trying to guess defaults for `user.email`
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 4b90b9c12a..ec15ee8d6f 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -69,7 +69,6 @@ OPTIONS
Do not GPG-sign commit, to countermand a `--gpg-sign` option
given earlier on the command line.
-
Commit Information
------------------
@@ -79,26 +78,6 @@ A commit encapsulates:
- author name, email and date
- committer name and email and the commit time.
-While parent object ids are provided on the command line, author and
-committer information is taken from the following environment variables,
-if set:
-
- GIT_AUTHOR_NAME
- GIT_AUTHOR_EMAIL
- GIT_AUTHOR_DATE
- GIT_COMMITTER_NAME
- GIT_COMMITTER_EMAIL
- GIT_COMMITTER_DATE
-
-(nb "<", ">" and "\n"s are stripped)
-
-In case (some of) these environment variables are not set, the information
-is taken from the configuration items user.name and user.email, or, if not
-present, the environment variable EMAIL, or, if that is not set,
-system user name and the hostname used for outgoing mail (taken
-from `/etc/mailname` and falling back to the fully qualified hostname when
-that file does not exist).
-
A commit comment is read from stdin. If a changelog
entry is not provided via "<" redirection, 'git commit-tree' will just wait
for one to be entered and terminated with ^D.
@@ -117,6 +96,7 @@ FILES
SEE ALSO
--------
linkgit:git-write-tree[1]
+linkgit:git-commit[1]
GIT
---
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index ced5a9beab..30c30ccd80 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -367,9 +367,6 @@ changes to tracked files.
+
For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
-:git-commit: 1
-include::date-formats.txt[]
-
EXAMPLES
--------
When recording your own work, the contents of modified files in
@@ -463,6 +460,30 @@ alter the order the changes are committed, because the merge
should be recorded as a single commit. In fact, the command
refuses to run when given pathnames (but see `-i` option).
+COMMIT INFORMATION
+------------------
+
+Author and committer information is taken from the following environment
+variables, if set:
+
+ GIT_AUTHOR_NAME
+ GIT_AUTHOR_EMAIL
+ GIT_AUTHOR_DATE
+ GIT_COMMITTER_NAME
+ GIT_COMMITTER_EMAIL
+ GIT_COMMITTER_DATE
+
+(nb "<", ">" and "\n"s are stripped)
+
+In case (some of) these environment variables are not set, the information
+is taken from the configuration items `user.name` and `user.email`, or, if not
+present, the environment variable EMAIL, or, if that is not set,
+system user name and the hostname used for outgoing mail (taken
+from `/etc/mailname` and falling back to the fully qualified hostname when
+that file does not exist).
+
+:git-commit: 1
+include::date-formats.txt[]
DISCUSSION
----------
diff --git a/Documentation/git.txt b/Documentation/git.txt
index b1597ac002..0093c647bf 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -482,13 +482,36 @@ double-quotes and respecting backslash escapes. E.g., the value
Git Commits
~~~~~~~~~~~
`GIT_AUTHOR_NAME`::
+ The human-readable name used in the author identity when creating commit or
+ tag objects, or when writing reflogs. Overrides the `user.name` and
+ `author.name` configuration settings.
+
`GIT_AUTHOR_EMAIL`::
+ The email address used in the author identity when creating commit or
+ tag objects, or when writing reflogs. Overrides the `user.email` and
+ `author.email` configuration settings.
+
`GIT_AUTHOR_DATE`::
+ The date used for the author identity when creating commit or tag objects, or
+ when writing reflogs. See linkgit:git-commit[1] for valid formats.
+
`GIT_COMMITTER_NAME`::
+ The human-readable name used in the committer identity when creating commit or
+ tag objects, or when writing reflogs. Overrides the `user.name` and
+ `committer.name` configuration settings.
+
`GIT_COMMITTER_EMAIL`::
+ The email address used in the author identity when creating commit or
+ tag objects, or when writing reflogs. Overrides the `user.email` and
+ `committer.email` configuration settings.
+
`GIT_COMMITTER_DATE`::
-'EMAIL'::
- see linkgit:git-commit-tree[1]
+ The date used for the committer identity when creating commit or tag objects, or
+ when writing reflogs. See linkgit:git-commit[1] for valid formats.
+
+`EMAIL`::
+ The email address used in the author and committer identities if no other
+ relevant environment variable or configuration setting has been set.
Git Diffs
~~~~~~~~~
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v5 2/5] docs: expand on possible and recommended user config options
2020-01-22 3:45 [PATCH v5 0/5] Documentation for common user misconceptions brian m. carlson
2020-01-22 3:45 ` [PATCH v5 1/5] doc: move author and committer information to git-commit(1) brian m. carlson
@ 2020-01-22 3:45 ` brian m. carlson
2020-01-22 3:45 ` [PATCH v5 3/5] doc: provide guidance on user.name format brian m. carlson
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: brian m. carlson @ 2020-01-22 3:45 UTC (permalink / raw)
To: git; +Cc: Jeff King, Junio C Hamano
In the section on setting author and committer information, we omit the
author.* and committer.* variables, so mention them for completeness.
In addition, guide users to the typical case: simply setting user.name
and user.email, which are recommended if one does not need complex
configuration.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
Documentation/git-commit.txt | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 30c30ccd80..7b61c9ba79 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -482,6 +482,13 @@ system user name and the hostname used for outgoing mail (taken
from `/etc/mailname` and falling back to the fully qualified hostname when
that file does not exist).
+The `author.name` and `committer.name` and their corresponding email options
+override `user.name` and `user.email` if set and are overridden themselves by
+the environment variables.
+
+The typical usage is to set just the `user.name` and `user.email` variables;
+the other options are provided for more complex use cases.
+
:git-commit: 1
include::date-formats.txt[]
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v5 3/5] doc: provide guidance on user.name format
2020-01-22 3:45 [PATCH v5 0/5] Documentation for common user misconceptions brian m. carlson
2020-01-22 3:45 ` [PATCH v5 1/5] doc: move author and committer information to git-commit(1) brian m. carlson
2020-01-22 3:45 ` [PATCH v5 2/5] docs: expand on possible and recommended user config options brian m. carlson
@ 2020-01-22 3:45 ` brian m. carlson
2020-01-22 3:45 ` [PATCH v5 4/5] doc: dissuade users from trying to ignore tracked files brian m. carlson
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: brian m. carlson @ 2020-01-22 3:45 UTC (permalink / raw)
To: git; +Cc: Jeff King, Junio C Hamano
It's a frequent misconception that the user.name variable controls
authentication in some way, and as a result, beginning users frequently
attempt to change it when they're having authentication troubles.
Document that the convention is that this variable represents some form
of a human's personal name, although that is not required. In addition,
address concerns about whether Unicode is supported.
Use the term "personal name" as this is likely to draw the intended
contrast, be applicable across cultures which may have different naming
conventions, and be easily understandable to people who do not speak
English as their first language. Indicate that "some form" is
conventionally used, as people may use a nickname or preferred name
instead of a full legal name.
Point users who may be confused about authentication to an appropriate
configuration option instead. Provide a shortened form of this
information in the configuration option description.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
Documentation/config/user.txt | 7 ++++++-
Documentation/git-commit.txt | 6 ++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index a1f80e823c..59aec7c3ae 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -13,7 +13,12 @@ committer.email::
Also, all of these can be overridden by the `GIT_AUTHOR_NAME`,
`GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,
`GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.
- See linkgit:git-commit[1] for more information.
++
+Note that the `name` forms of these variables conventionally refer to
+some form of a personal name. See linkgit:git-commit[1] and the
+environment variables section of linkgit:git[1] for more information on
+these settings and the `credential.username` option if you're looking
+for authentication credentials instead.
user.useConfigOnly::
Instruct Git to avoid trying to guess defaults for `user.email`
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 7b61c9ba79..13f653989f 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -475,6 +475,12 @@ variables, if set:
(nb "<", ">" and "\n"s are stripped)
+The author and committer names are by convention some form of a personal name
+(that is, the name by which other humans refer to you), although Git does not
+enforce or require any particular form. Arbitrary Unicode may be used, subject
+to the constraints listed above. This name has no effect on authentication; for
+that, see the `credential.username` variable in linkgit:git-config[1].
+
In case (some of) these environment variables are not set, the information
is taken from the configuration items `user.name` and `user.email`, or, if not
present, the environment variable EMAIL, or, if that is not set,
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v5 4/5] doc: dissuade users from trying to ignore tracked files
2020-01-22 3:45 [PATCH v5 0/5] Documentation for common user misconceptions brian m. carlson
` (2 preceding siblings ...)
2020-01-22 3:45 ` [PATCH v5 3/5] doc: provide guidance on user.name format brian m. carlson
@ 2020-01-22 3:45 ` brian m. carlson
2020-01-22 3:45 ` [PATCH v5 5/5] docs: mention when increasing http.postBuffer is valuable brian m. carlson
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: brian m. carlson @ 2020-01-22 3:45 UTC (permalink / raw)
To: git; +Cc: Jeff King, Junio C Hamano
It is quite common for users to want to ignore the changes to a file
that Git tracks. Common scenarios for this case are IDE settings and
configuration files, which should generally not be tracked and possibly
generated from tracked files using a templating mechanism.
However, users learn about the assume-unchanged and skip-worktree bits
and try to use them to do this anyway. This is problematic, because
when these bits are set, many operations behave as the user expects, but
they usually do not help when git checkout needs to replace a file.
There is no sensible behavior in this case, because sometimes the data
is precious, such as certain configuration files, and sometimes it is
irrelevant data that the user would be happy to discard.
Since this is not a supported configuration and users are prone to
misuse the existing features for unintended purposes, causing general
sadness and confusion, let's document the existing behavior and the
pitfalls in the documentation for git update-index so that users know
they should explore alternate solutions.
In addition, let's provide a recommended solution to dealing with the
common case of configuration files, since there are well-known
approaches used successfully in many environments.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
Documentation/git-update-index.txt | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index c7a6271daf..1489cb09a0 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -549,6 +549,22 @@ The untracked cache extension can be enabled by the
`core.untrackedCache` configuration variable (see
linkgit:git-config[1]).
+NOTES
+-----
+
+Users often try to use the assume-unchanged and skip-worktree bits
+to tell Git to ignore changes to files that are tracked. This does not
+work as expected, since Git may still check working tree files against
+the index when performing certain operations. In general, Git does not
+provide a way to ignore changes to tracked files, so alternate solutions
+are recommended.
+
+For example, if the file you want to change is some sort of config file,
+the repository can include a sample config file that can then be copied
+into the ignored name and modified. The repository can even include a
+script to treat the sample file as a template, modifying and copying it
+automatically.
+
SEE ALSO
--------
linkgit:git-config[1],
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v5 5/5] docs: mention when increasing http.postBuffer is valuable
2020-01-22 3:45 [PATCH v5 0/5] Documentation for common user misconceptions brian m. carlson
` (3 preceding siblings ...)
2020-01-22 3:45 ` [PATCH v5 4/5] doc: dissuade users from trying to ignore tracked files brian m. carlson
@ 2020-01-22 3:45 ` brian m. carlson
2020-01-22 3:52 ` [PATCH v5 0/5] Documentation for common user misconceptions Jeff King
2020-01-22 19:25 ` Emily Shaffer
6 siblings, 0 replies; 8+ messages in thread
From: brian m. carlson @ 2020-01-22 3:45 UTC (permalink / raw)
To: git; +Cc: Jeff King, Junio C Hamano
Users in a wide variety of situations find themselves with HTTP push
problems. Oftentimes these issues are due to antivirus software,
filtering proxies, or other man-in-the-middle situations; other times,
they are due to simple unreliability of the network.
However, a common solution to HTTP push problems found online is to
increase http.postBuffer. This works for none of the aforementioned
situations and is only useful in a small, highly restricted number of
cases: essentially, when the connection does not properly support
HTTP/1.1.
Document when raising this value is appropriate and what it actually
does, and discourage people from using it as a general solution for push
problems, since it is not effective there.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
Documentation/config/http.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 5a32f5b0a5..3d1db91f05 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -199,6 +199,14 @@ http.postBuffer::
Transfer-Encoding: chunked is used to avoid creating a
massive pack file locally. Default is 1 MiB, which is
sufficient for most requests.
++
+Note that raising this limit is only effective for disabling chunked
+transfer encoding and therefore should be used only where the remote
+server or a proxy only supports HTTP/1.0 or is noncompliant with the
+HTTP standard. Raising this is not, in general, an effective solution
+for most push problems, but can increase memory consumption
+significantly since the entire buffer is allocated even for small
+pushes.
http.lowSpeedLimit, http.lowSpeedTime::
If the HTTP transfer speed is less than 'http.lowSpeedLimit'
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v5 0/5] Documentation for common user misconceptions
2020-01-22 3:45 [PATCH v5 0/5] Documentation for common user misconceptions brian m. carlson
` (4 preceding siblings ...)
2020-01-22 3:45 ` [PATCH v5 5/5] docs: mention when increasing http.postBuffer is valuable brian m. carlson
@ 2020-01-22 3:52 ` Jeff King
2020-01-22 19:25 ` Emily Shaffer
6 siblings, 0 replies; 8+ messages in thread
From: Jeff King @ 2020-01-22 3:52 UTC (permalink / raw)
To: brian m. carlson; +Cc: git, Junio C Hamano
On Wed, Jan 22, 2020 at 03:45:38AM +0000, brian m. carlson wrote:
> This is v5 of a series improving the documentation to cover common user
> misconceptions.
>
> Changes from v4:
> * Add a reference to git(1) for environment variables.
> * Remove duplicated text.
> * Add Peff's sign-off.
Thanks, just looking at the interdiff I think this addresses all of my
comments.
-Peff
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v5 0/5] Documentation for common user misconceptions
2020-01-22 3:45 [PATCH v5 0/5] Documentation for common user misconceptions brian m. carlson
` (5 preceding siblings ...)
2020-01-22 3:52 ` [PATCH v5 0/5] Documentation for common user misconceptions Jeff King
@ 2020-01-22 19:25 ` Emily Shaffer
6 siblings, 0 replies; 8+ messages in thread
From: Emily Shaffer @ 2020-01-22 19:25 UTC (permalink / raw)
To: brian m. carlson; +Cc: git, Jeff King, Junio C Hamano
On Wed, Jan 22, 2020 at 03:45:38AM +0000, brian m. carlson wrote:
> This is v5 of a series improving the documentation to cover common user
> misconceptions.
Thanks - it makes me happy to see these kinds of clarifications come
through.
Reviewed-by: Emily Shaffer <emilyshaffer@google.com>
^ permalink raw reply [flat|nested] 8+ messages in thread