From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
Subject: [PATCH v2 0/2] diff: index-line: respect --abbrev in object's name
Date: Tue, 11 Aug 2020 18:49:55 +0700 [thread overview]
Message-ID: <cover.1597146478.git.congdanhqx@gmail.com> (raw)
In-Reply-To: <cover.1596887883.git.congdanhqx@gmail.com>
For diff-family, Git supports 2 different options for 2 different
purposes, `--full-index' for showing diff-patch object's name in full,
and `--abbrev' to customize the length of object names in diff-raw and
diff-tree header lines, without any options to customise the length of
object names in diff-patch format. When working with diff-patch format,
we only have two options, either full index, or default abbrev length.
Although, that consistent is documented, it doesn't stop users from
trying to use `--abbrev' with the hope of customising diff-patch's
objects' name's abbreviation.
Let's resolve that inconsistency.
Đoàn Trần Công Danh (2):
revision: differentiate if --no-abbrev asked explicitly
diff: index-line: respect --abbrev in object's name
Documentation/diff-options.txt | 9 +++---
diff.c | 5 +++-
revision.c | 2 +-
t/t4013-diff-various.sh | 3 ++
...ff.diff-tree_--root_-p_--abbrev=10_initial | 29 +++++++++++++++++++
...--root_-p_--full-index_--abbrev=10_initial | 29 +++++++++++++++++++
...f.diff-tree_--root_-p_--full-index_initial | 29 +++++++++++++++++++
7 files changed, 100 insertions(+), 6 deletions(-)
create mode 100644 t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial
create mode 100644 t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial
create mode 100644 t/t4013/diff.diff-tree_--root_-p_--full-index_initial
Range-diff against v1:
1: 9daef7445c = 1: 9daef7445c revision: differentiate if --no-abbrev asked explicitly
2: 9146313893 ! 2: 12acf1fe5d diff: extend --abbrev support to diff-patch format
@@ Metadata
Author: Đoàn Trần Công Danh <congdanhqx@gmail.com>
## Commit message ##
- diff: extend --abbrev support to diff-patch format
+ diff: index-line: respect --abbrev in object's name
+
+ A handful of Git's commands respect `--abbrev' for customizing length
+ of abbreviation of object names.
+
+ For diff-family, Git supports 2 different options for 2 different
+ purposes, `--full-index' for showing diff-patch object's name in full,
+ and `--abbrev' to customize the length of object names in diff-raw and
+ diff-tree header lines, without any options to customise the length of
+ object names in diff-patch format. When working with diff-patch format,
+ we only have two options, either full index, or default abbrev length.
+
+ Although, that consistent is documented, it doesn't stop users from
+ trying to use `--abbrev' with the hope of customising diff-patch's
+ objects' name's abbreviation.
+
+ Let's resolve that inconsistency.
+
+ To preserve backward compatibility with old script that specify both
+ `--full-index' and `--abbrev', always shows full object id
+ if `--full-index' is specified.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
--
2.28.0.215.g32ffa52ee0
next prev parent reply other threads:[~2020-08-11 11:50 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-09 2:19 [RFC PATCH 0/2] extend --abbrev support to diff-patch format Đoàn Trần Công Danh
2020-08-09 2:19 ` [RFC PATCH 1/2] revision: differentiate if --no-abbrev asked explicitly Đoàn Trần Công Danh
2020-08-09 2:19 ` [RFC PATCH 2/2] diff: extend --abbrev support to diff-patch format Đoàn Trần Công Danh
2020-08-09 19:01 ` [RFC PATCH 0/2] " Junio C Hamano
2020-08-10 10:00 ` Jeff King
2020-08-10 12:31 ` Đoàn Trần Công Danh
2020-08-10 15:15 ` Junio C Hamano
2020-08-10 15:27 ` Jeff King
2020-08-11 0:33 ` Đoàn Trần Công Danh
2020-08-11 5:22 ` Jeff King
2020-08-11 12:07 ` Đoàn Trần Công Danh
2020-08-10 15:06 ` Junio C Hamano
2020-08-11 11:49 ` Đoàn Trần Công Danh [this message]
2020-08-11 11:49 ` [PATCH v2 1/2] revision: differentiate if --no-abbrev asked explicitly Đoàn Trần Công Danh
2020-08-11 18:54 ` Junio C Hamano
2020-08-11 11:49 ` [PATCH v2 2/2] diff: index-line: respect --abbrev in object's name Đoàn Trần Công Danh
2020-08-14 0:23 ` [PATCH v3 0/2] " Đoàn Trần Công Danh
2020-08-14 0:23 ` [PATCH v3 1/2] revision: differentiate if --no-abbrev asked explicitly Đoàn Trần Công Danh
2020-08-14 0:50 ` Junio C Hamano
2020-08-14 0:59 ` Đoàn Trần Công Danh
2020-08-14 1:06 ` Junio C Hamano
2020-08-14 14:50 ` Đoàn Trần Công Danh
2020-08-19 22:50 ` Junio C Hamano
2020-08-14 0:23 ` [PATCH v3 2/2] diff: index-line: respect --abbrev in object's name Đoàn Trần Công Danh
2020-08-14 15:18 ` SZEDER Gábor
2020-08-14 17:00 ` Junio C Hamano
2020-08-14 18:59 ` Junio C Hamano
2020-08-15 0:21 ` brian m. carlson
2020-08-15 2:27 ` Đoàn Trần Công Danh
2020-08-17 16:17 ` Junio C Hamano
2020-08-20 4:56 ` Junio C Hamano
2020-08-20 12:35 ` [PATCH v4 0/2] " Đoàn Trần Công Danh
2020-08-20 12:35 ` [PATCH v4 1/2] t4013: improve diff-post-processor logic Đoàn Trần Công Danh
2020-08-20 19:49 ` Junio C Hamano
2020-08-21 12:05 ` Đoàn Trần Công Danh
2020-08-21 15:44 ` Junio C Hamano
2020-08-20 12:35 ` [PATCH v4 2/2] diff: index-line: respect --abbrev in object's name Đoàn Trần Công Danh
2020-08-20 19:58 ` Junio C Hamano
2020-08-21 11:51 ` [PATCH v5 0/2] " Đoàn Trần Công Danh
2020-08-21 11:51 ` [PATCH v5 1/2] t4013: improve diff-post-processor logic Đoàn Trần Công Danh
2020-08-21 11:51 ` [PATCH v5 2/2] diff: index-line: respect --abbrev in object's name Đoàn Trần Công Danh
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1597146478.git.congdanhqx@gmail.com \
--to=congdanhqx@gmail.com \
--cc=git@vger.kernel.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.
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 NNTP newsgroup(s).