kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'fg/submodule-fixup' 

Code cleanup.

* fg/submodule-fixup:
  git-submodule.sh: remove duplicate call to set_rev_name
maint
Junio C Hamano 2013-06-24 13:48:50 -07:00
parent 9f19e0c310 b545cd15af
commit 515cded0fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-submodule.sh
View File

@ -1129,16 +1129,16 @@ cmd_status()
say "-$sha1 $displaypath" say "-$sha1 $displaypath"
continue; continue;
fi fi
set_name_rev "$sm_path" "$sha1"
if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path" if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
then then
set_name_rev "$sm_path" "$sha1"
say " $sha1 $displaypath$revname" say " $sha1 $displaypath$revname"
else else
if test -z "$cached" if test -z "$cached"
then then
sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD) sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
set_name_rev "$sm_path" "$sha1"
fi fi
set_name_rev "$sm_path" "$sha1"
say "+$sha1 $displaypath$revname" say "+$sha1 $displaypath$revname"
fi fi