From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2019 06:05:27 +0000 (-0800)
Subject: Merge branch 'sh/submodule-summary-abbrev-fix'
X-Git-Tag: v2.21.0-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/257507a35e1d13d8849bbdf9324a060232a82bdf?ds=sidebyside;hp=-c

Merge branch 'sh/submodule-summary-abbrev-fix'

The "git submodule summary" subcommand showed shortened commit
object names by mechanically truncating them at 7-hexdigit, which
has been improved to let "rev-parse --short" scale the length of
the abbreviation with the size of the repository.

* sh/submodule-summary-abbrev-fix:
git-submodule.sh: shorten submodule SHA-1s using rev-parse
---

257507a35e1d13d8849bbdf9324a060232a82bdf
diff --combined git-submodule.sh
index 02a0d72817,e26146e721..b5f2beee60
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -548,7 -548,7 +548,7 @@@ cmd_update(
  	do
  		die_if_unmatched "$quickabort" "$sha1"
  
 -		git submodule--helper ensure-core-worktree "$sm_path"
 +		git submodule--helper ensure-core-worktree "$sm_path" || exit 1
  
  		update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update)
  
@@@ -850,8 -850,11 +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")"