From: Sven van Haastregt <svenvh@gmail.com>
To: git@vger.kernel.org
Cc: Sven van Haastregt <svenvh@gmail.com>
Subject: [PATCH v3] git-submodule.sh: shorten submodule SHA-1s using rev-parse
Date: Sun, 3 Feb 2019 21:00:27 +0000 [thread overview]
Message-ID: <20190203210027.13272-1-svenvh@gmail.com> (raw)
Until now, `git submodule summary` was always emitting 7-character
SHA-1s that have a higher chance of being ambiguous for larger
repositories. Use `git rev-parse --short` instead, which will
determine suitable short SHA-1 lengths.
We cannot always rely on successfully invoking `git rev-parse` in the
submodule directory. Keep the old method using `cut` as a fallback.
Signed-off-by: Sven van Haastregt <svenvh@gmail.com>
---
Differences since v2: Simplify code as suggested by Eric
Sunshine <sunshine@sunshineco.com> and suppress stderr.
git-submodule.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 5e608f8bad..e26146e721 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -850,8 +850,11 @@ cmd_summary() {
;;
esac
- sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
- sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
+ sha1_abbr_src=$(GIT_DIR="$name/.git" git rev-parse --short $sha1_src 2>/dev/null ||
+ echo $sha1_src | cut -c1-7)
+ sha1_abbr_dst=$(GIT_DIR="$name/.git" git rev-parse --short $sha1_dst 2>/dev/null ||
+ echo $sha1_dst | cut -c1-7)
+
if test $status = T
then
blob="$(gettext "blob")"
--
2.20.1.dirty
next reply other threads:[~2019-02-03 21:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-03 21:00 Sven van Haastregt [this message]
2019-02-03 21:28 ` [PATCH v3] git-submodule.sh: shorten submodule SHA-1s using rev-parse Eric Sunshine
2019-02-04 18:47 ` Junio C Hamano
2019-02-04 19:01 ` Eric Sunshine
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=20190203210027.13272-1-svenvh@gmail.com \
--to=svenvh@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.
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).