From: "Nikita Leonov via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Nikita Leonov <nykyta.leonov@gmail.com>
Subject: [PATCH v2 3/3] docs: make notes regarding credential line reading
Date: Mon, 28 Sep 2020 11:40:24 +0000 [thread overview]
Message-ID: <61baea106115277fb0c39d3b2a79770306f5a465.1601293224.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.710.v2.git.git.1601293224.gitgitgadget@gmail.com>
From: Nikita Leonov <nykyta.leonov@gmail.com>
This commit adds notes to git-credential.txt and to gitcredentials.txt
specifying that 'LF' and 'CR/LF' endings are treated the same.
Signed-off-by: Nikita Leonov <nykyta.leonov@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Documentation/git-credential.txt | 4 +++-
Documentation/gitcredentials.txt | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index 31c81c4c02..9cf25126f2 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -114,7 +114,9 @@ The key may contain any bytes except `=`, newline, or NUL. The value may
contain any bytes except newline or NUL.
In both cases, all bytes are treated as-is (i.e., there is no quoting,
-and one cannot transmit a value with newline or NUL in it). The list of
+and one cannot transmit a value with newline or NUL in it). Note that
+Git will treat a carriage return before the final newline as part of
+line ending, and not part of the data. The list of
attributes is terminated by a blank line or end-of-file.
Git understands the following attributes:
diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt
index 758bf39ba3..184079eaa4 100644
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -141,6 +141,8 @@ entry for `https://example.com/bar/baz.git` (in addition to matching the config
entry for `https://example.com`) but will not match a config entry for
`https://example.com/bar`.
+Note that Git will treat a carriage return before the final newline as part
+of line ending, and not part of the data.
CONFIGURATION OPTIONS
---------------------
--
gitgitgadget
next prev parent reply other threads:[~2020-09-28 11:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 13:49 [PATCH] credential.c: fix credential reading with regards to CR/LF Johannes Schindelin via GitGitGadget
2020-02-14 17:55 ` Junio C Hamano
2020-02-14 18:32 ` Jeff King
2020-09-28 11:40 ` [PATCH v2 0/3] Prepare git credential to read input with DOS line endings Johannes Schindelin via GitGitGadget
2020-09-28 11:40 ` [PATCH v2 1/3] credential.c: fix credential reading with regards to CR/LF Nikita Leonov via GitGitGadget
2020-09-29 0:42 ` Jeff King
2020-10-02 11:37 ` Johannes Schindelin
2020-10-02 12:01 ` Jeff King
2020-10-02 12:27 ` Johannes Schindelin
2020-10-02 16:32 ` Junio C Hamano
2020-10-03 13:28 ` Johannes Schindelin
2020-09-28 11:40 ` [PATCH v2 2/3] credentials: make line reading Windows compatible Nikita Leonov via GitGitGadget
2020-09-28 20:58 ` Junio C Hamano
2020-09-29 0:35 ` Jeff King
2020-09-30 22:33 ` Junio C Hamano
2020-10-02 7:53 ` Johannes Schindelin
2020-09-28 23:26 ` Carlo Arenas
2020-09-28 23:41 ` Junio C Hamano
2020-09-29 0:30 ` Jeff King
2020-09-29 0:41 ` Junio C Hamano
2020-09-29 0:44 ` Jeff King
2020-09-29 0:54 ` Junio C Hamano
2020-09-29 3:00 ` Jeff King
2020-09-30 22:25 ` Junio C Hamano
2020-09-30 22:39 ` Jeff King
2020-09-30 22:56 ` Junio C Hamano
2020-10-01 13:54 ` Jeff King
2020-10-01 15:42 ` Junio C Hamano
2020-10-02 8:07 ` Johannes Schindelin
2020-09-28 11:40 ` Nikita Leonov via GitGitGadget [this message]
2020-09-28 20:31 ` [PATCH v2 0/3] Prepare git credential to read input with DOS line endings Junio C Hamano
2020-10-03 13:29 ` [PATCH v3] credential: treat CR/LF as line endings in the credential protocol Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=61baea106115277fb0c39d3b2a79770306f5a465.1601293224.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=nykyta.leonov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).