diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-03-02 23:59:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 23:59:50 -0800 |
commit | 6b48990354b6380665565f21c3f89d2f7109c459 (patch) | |
tree | c3eefde8d65ef12c7af7a68ba045cc55f98cd2b8 /git-submodule.sh | |
parent | 34cd62eb91600109378c8121c1fecd924a9af177 (diff) | |
parent | d3df4271b900c9bf529cf495afeb77fbbf621221 (diff) | |
download | git-6b48990354b6380665565f21c3f89d2f7109c459.tar.gz git-6b48990354b6380665565f21c3f89d2f7109c459.tar.xz |
Merge branch 'maint'
* maint:
Update draft release notes for 1.5.4.4
revert: actually check for a dirty index
tests: introduce test_must_fail
git-submodule: Fix typo 'url' which should be '$url'
receive-pack: Initialize PATH to include exec-dir.
Conflicts:
builtin-revert.c
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-x | git-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index a6aaf40b0..67d3224c8 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -362,7 +362,7 @@ cmd_status() do name=$(module_name "$path") || exit url=$(git config submodule."$name".url) - if test -z "url" || ! test -d "$path"/.git + if test -z "$url" || ! test -d "$path"/.git then say "-$sha1 $path" continue; |