diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:04 -0700 |
commit | 5696eb3c09da6cf2186650a8681af22abe5e594b (patch) | |
tree | 82dfd69aee9730aa6705a2b1ef7779e8d470aec0 /git-submodule.sh | |
parent | bdfcdefd2f0587873436c950dd7a0798d313eb34 (diff) | |
parent | 974ce8078c9a91190d798eaa65c9f173dd50c3f8 (diff) | |
download | git-5696eb3c09da6cf2186650a8681af22abe5e594b.tar.gz git-5696eb3c09da6cf2186650a8681af22abe5e594b.tar.xz |
Merge branch 'mf/no-dashed-subcommands'
Code clean-up.
* mf/no-dashed-subcommands:
scripts: use "git foo" not "git-foo"
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-x | git-submodule.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index e131760ee..ffa2d6648 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -864,7 +864,7 @@ cmd_summary() { test $status != A && test $ignore_config = all && continue fi # Also show added or modified modules which are checked out - GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 && + GIT_DIR="$sm_path/.git" git rev-parse --git-dir >/dev/null 2>&1 && printf '%s\n' "$sm_path" done ) @@ -898,11 +898,11 @@ cmd_summary() { missing_dst= test $mod_src = 160000 && - ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null && + ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_src^0 >/dev/null && missing_src=t test $mod_dst = 160000 && - ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null && + ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_dst^0 >/dev/null && missing_dst=t display_name=$(git submodule--helper relative-path "$name" "$wt_prefix") |