diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-09 00:19:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-09 00:19:50 -0700 |
| commit | bb293b831b9d0aade79c0acf5bf6091106e7d19b (patch) | |
| tree | 6549f6423c83a66b04bf51daedcb5fa592170c27 /git-submodule.sh | |
| parent | Documentation: update sections on naming revisions and revision ranges (diff) | |
| parent | Start preparing release notes for 1.5.6.3 (diff) | |
| download | git-bb293b831b9d0aade79c0acf5bf6091106e7d19b.tar.gz git-bb293b831b9d0aade79c0acf5bf6091106e7d19b.zip | |
Merge branch 'maint'
* maint:
Start preparing release notes for 1.5.6.3
git-submodule - Fix bugs in adding an existing repo as a module
bash: offer only paths after '--'
Remove unnecessary pack-*.keep file after successful git-clone
make deleting a missing ref more quiet
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 3eb78cc724..099a7d7560 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -167,8 +167,7 @@ cmd_add() # perhaps the path exists and is already a git repo, else clone it if test -e "$path" then - if test -d "$path/.git" && - test "$(unset GIT_DIR; cd $path; git rev-parse --git-dir)" = ".git" + if test -d "$path"/.git -o -f "$path"/.git then echo "Adding existing repo at '$path' to the index" else |