From: Ann T Ropea <bedhanger@gmx.de>
To: Philip Oakley <philipoakley@iee.org>, Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Ann T Ropea <bedhanger@gmx.de>
Subject: Re: [PATCH v2 1/6] config: introduce core.printsha1ellipsis
Date: Mon, 13 Nov 2017 23:36:49 +0100 [thread overview]
Message-ID: <20171113223654.27732-1-bedhanger@gmx.de> (raw)
In-Reply-To: <EA775C6AB4684B7A86A88C733C132827@PhilipOakley>
We use it to ascertain whether or not the user wants an ellipsis
printed after an abbreviated SHA-1 value.
By de-asserting it in the default, we encourage not printing the
ellipsis in such circumstances.
Not adding a corresponding cli option is intentional; and we would like
to remove the config option *and* the ellipses after abbreviated SHA-1
values after a respectable period.
Signed-off-by: Ann T Ropea <bedhanger@gmx.de>
---
v2: rename patch series & focus on removal of ellipses
Documentation/config.txt | 10 ++++++++++
cache.h | 1 +
config.c | 9 +++++++++
environment.c | 1 +
4 files changed, 21 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 671fcbaa0fd1..93887820ff89 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -898,6 +898,16 @@ core.abbrev::
abbreviated object names to stay unique for some time.
The minimum length is 4.
+core.printsha1ellipsis (deprecated)::
+ A Boolean controlling whether an ellipsis should be
+ printed following an (abbreviated) SHA-1 value. This
+ affects indications of detached HEADs or the raw diff
+ output. Printing an ellipsis in the cases mentioned is no
+ longer considered adequate and support for it will be
+ removed in the foreseeable future (along with the
+ option).
+ Therefore, the default is false.
+
add.ignoreErrors::
add.ignore-errors (deprecated)::
Tells 'git add' to continue adding files when some files cannot be
diff --git a/cache.h b/cache.h
index cb7fb7c004be..5cbc50a0c1ab 100644
--- a/cache.h
+++ b/cache.h
@@ -753,6 +753,7 @@ extern int check_stat;
extern int quote_path_fully;
extern int has_symlinks;
extern int minimum_abbrev, default_abbrev;
+extern int print_sha1_ellipsis;
extern int ignore_case;
extern int assume_unchanged;
extern int prefer_symlink_refs;
diff --git a/config.c b/config.c
index 903abf9533b1..f560aea5e98b 100644
--- a/config.c
+++ b/config.c
@@ -1073,6 +1073,15 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ /* Printing an ellipsis after an abbreviated SHA-1 value
+ * is no longer desired but must be selectable for some
+ * time to come.
+ */
+ if (!strcmp(var, "core.printsha1ellipsis")) {
+ print_sha1_ellipsis = git_config_bool(var, value);
+ return 0;
+ }
+
if (!strcmp(var, "core.disambiguate"))
return set_disambiguate_hint_config(var, value);
diff --git a/environment.c b/environment.c
index 8289c25b44d7..5ceb92f921c6 100644
--- a/environment.c
+++ b/environment.c
@@ -19,6 +19,7 @@ int trust_ctime = 1;
int check_stat = 1;
int has_symlinks = 1;
int minimum_abbrev = 4, default_abbrev = -1;
+int print_sha1_ellipsis = 0; /* Only if the user requests it. */
int ignore_case;
int assume_unchanged;
int prefer_symlink_refs;
--
2.13.6
next prev parent reply other threads:[~2017-11-13 22:38 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-05 16:27 [PATCH 1/3] checkout: describe_detached_head: remove 3dots after committish Ann T Ropea
2017-11-05 16:27 ` [PATCH 2/3] Documentation: user-manual: limit potentially confusing usage of 3dots (and 2dots) Ann T Ropea
2017-11-05 16:27 ` [PATCH 3/3] Documentation: revisions: add note about 3dots usages as continuation indications Ann T Ropea
2017-11-06 4:34 ` Junio C Hamano
2017-11-06 2:45 ` [PATCH 1/3] checkout: describe_detached_head: remove 3dots after committish Junio C Hamano
2017-11-07 0:30 ` Philip Oakley
2017-11-07 0:52 ` Junio C Hamano
2017-11-07 2:53 ` Ann T Ropea
2017-11-07 23:25 ` Philip Oakley
2017-11-08 1:59 ` Junio C Hamano
2017-11-09 23:15 ` Philip Oakley
2017-11-13 22:36 ` Ann T Ropea [this message]
2017-11-13 22:36 ` [PATCH v2 2/6] checkout: describe_detached_head: remove ellipsis " Ann T Ropea
2017-11-13 22:36 ` [PATCH v2 3/6] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value Ann T Ropea
2017-11-14 3:08 ` Junio C Hamano
2017-11-19 17:38 ` Ann T Ropea
2017-11-20 1:48 ` Junio C Hamano
2017-11-19 18:41 ` [PATCH v3 1/5] checkout: describe_detached_head: remove ellipsis after committish Ann T Ropea
2017-11-20 3:35 ` Junio C Hamano
2017-11-19 18:41 ` [PATCH v3 2/5] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value Ann T Ropea
2017-11-19 19:11 ` Eric Sunshine
2017-11-19 18:41 ` [PATCH v3 3/5] Documentation: user-manual: limit usage of ellipsis Ann T Ropea
2017-11-19 19:15 ` Eric Sunshine
2017-11-24 23:53 ` [PATCH v4 1/6] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value Ann T Ropea
2017-11-25 5:01 ` Junio C Hamano
2017-11-26 3:17 ` Junio C Hamano
2017-11-26 3:19 ` Junio C Hamano
2017-11-26 3:25 ` Junio C Hamano
2017-12-03 21:27 ` [PATCH v5 1/7] Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot") Ann T Ropea
2017-12-04 16:52 ` Junio C Hamano
2017-12-03 21:27 ` [PATCH v5 2/7] Documentation: user-manual: limit usage of ellipsis Ann T Ropea
2017-12-03 21:27 ` [PATCH v5 3/7] print_sha1_ellipsis: introduce helper Ann T Ropea
2017-12-03 21:27 ` [PATCH v5 4/7] checkout: describe_detached_head: remove ellipsis after committish Ann T Ropea
2017-12-04 16:46 ` Junio C Hamano
2017-12-04 23:13 ` [PATCH v6 " Ann T Ropea
2017-12-05 16:03 ` Junio C Hamano
2017-12-06 0:20 ` [PATCH v7 " Ann T Ropea
2017-12-06 16:47 ` Junio C Hamano
2017-12-06 22:02 ` Ann T Ropea
2017-12-03 21:27 ` [PATCH v5 5/7] t4013: prepare for upcoming "diff --raw --abbrev" output format change Ann T Ropea
2017-12-03 21:27 ` [PATCH v5 6/7] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value Ann T Ropea
2017-12-03 21:27 ` [PATCH v5 7/7] t4013: test new output from diff --abbrev --raw Ann T Ropea
2017-11-24 23:53 ` [PATCH v4 2/6] checkout: describe_detached_head: remove ellipsis after committish Ann T Ropea
2017-11-24 23:53 ` [PATCH v4 3/6] Documentation: user-manual: limit usage of ellipsis Ann T Ropea
2017-11-24 23:53 ` [PATCH v4 4/6] Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot") Ann T Ropea
2017-11-24 23:53 ` [PATCH v4 5/6] Documentation: git: document GIT_PRINT_SHA1_ELLIPSIS Ann T Ropea
2017-11-24 23:53 ` [PATCH v4 6/6] Testing: provide existing tests requiring them with ellipses after SHA-1 values Ann T Ropea
2017-11-19 18:41 ` [PATCH v3 4/5] Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot") Ann T Ropea
2017-11-19 18:41 ` [PATCH v3 5/5] Testing: provide tests requiring them with ellipses after SHA-1 values Ann T Ropea
2017-11-20 4:06 ` Junio C Hamano
2017-11-20 12:25 ` Philip Oakley
2017-11-22 5:53 ` Junio C Hamano
2017-11-22 23:41 ` Philip Oakley
2017-11-24 0:40 ` Junio C Hamano
2017-11-13 22:36 ` [PATCH v2 4/6] Documentation: user-manual: limit usage of ellipsis Ann T Ropea
2017-11-13 22:36 ` [PATCH v2 5/6] Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot") Ann T Ropea
2017-11-13 22:36 ` [PATCH v2 6/6] Testing: provide tests requiring them with ellipses after SHA-1 values Ann T Ropea
2017-11-14 3:20 ` Junio C Hamano
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=20171113223654.27732-1-bedhanger@gmx.de \
--to=bedhanger@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.org \
/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).