diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:50 -0700 |
| commit | 515cded0fbdcdd13f1190ed5bf65c296e7dcf8fe (patch) | |
| tree | 65c4b17d361f5a9e7bb2d3f79db666a64e988073 | |
| parent | Merge branch 'dk/version-gen-gitdir' (diff) | |
| parent | git-submodule.sh: remove duplicate call to set_rev_name (diff) | |
| download | tgif-515cded0fbdcdd13f1190ed5bf65c296e7dcf8fe.tar.xz | |
Merge branch 'fg/submodule-fixup'
Code cleanup.
* fg/submodule-fixup:
git-submodule.sh: remove duplicate call to set_rev_name
| -rwxr-xr-x | git-submodule.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 79bfaac9d4..75feaf1749 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -1129,16 +1129,16 @@ cmd_status() say "-$sha1 $displaypath" continue; fi - set_name_rev "$sm_path" "$sha1" if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path" then + set_name_rev "$sm_path" "$sha1" say " $sha1 $displaypath$revname" else if test -z "$cached" then sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD) - set_name_rev "$sm_path" "$sha1" fi + set_name_rev "$sm_path" "$sha1" say "+$sha1 $displaypath$revname" fi |