[PATCH v2] git-submodule.sh: shorten submodule SHA-1s using rev-parse
- From
Sven van Haastregt <svenvh@gmail.com>
- Date
- Jan 27, 2019, 19:27 UTC
- Message-ID
- <20190127192740.8678-1-svenvh@gmail.com>
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 rely on always 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 v1: Keep the old method using `cut` as a fallback.
git-submodule.sh | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/git-submodule.sh b/git-submodule.sh index 5e608f8bad..5bd724e63b 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -850,8 +850,16 @@ cmd_summary() { ;; esac + # Ensure we have crudely abbreviated SHA-1s as fallback in case + # rev-parse fails to shorten the SHA-1s. sha1_abbr_src=$(echo $sha1_src | cut -c1-7) sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7) + + sha1_abbrev=$(GIT_DIR="$name/.git" git rev-parse --short $sha1_src) && + sha1_abbr_src=$sha1_abbrev + sha1_abbrev=$(GIT_DIR="$name/.git" git rev-parse --short $sha1_dst) && + sha1_abbr_dst=$sha1_abbrev + if test $status = T then blob="$(gettext "blob")"
-- 2.20.1.dirty