diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:41 -0700 |
| commit | cda4ba30b1d6257524b9412ed4d7c44645fe0369 (patch) | |
| tree | c02dddf0db7583b8a3f50dc08c6b375103f97ed8 /git-submodule.sh | |
| parent | f31d23a399d557d687266b4375a0436f920cc051 (diff) | |
| parent | 17f2f88c9c9e0015cba6d962dc6d9e2329ddf713 (diff) | |
| download | git-cda4ba30b1d6257524b9412ed4d7c44645fe0369.tar.xz | |
Merge branch 'jk/warn-add-gitlink'
Using "git add d/i/r" when d/i/r is the top of the working tree of
a separate repository would create a gitlink in the index, which
would appear as a not-quite-initialized submodule to others. We
learned to give warnings when this happens.
* jk/warn-add-gitlink:
t: move "git add submodule" into test blocks
add: warn when adding an embedded repository
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index c0d0e9a4c6..e131760eec 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -213,7 +213,8 @@ cmd_add() die "$(eval_gettext "'\$sm_path' already exists in the index and is not a submodule")" fi - if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1 + if test -z "$force" && + ! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1 then eval_gettextln "The following path is ignored by one of your .gitignore files: \$sm_path @@ -267,7 +268,7 @@ or you are unsure what this means choose another name with the '--name' option." fi git config submodule."$sm_name".url "$realrepo" - git add $force "$sm_path" || + git add --no-warn-embedded-repo $force "$sm_path" || die "$(eval_gettext "Failed to add submodule '\$sm_path'")" git config -f .gitmodules submodule."$sm_name".path "$sm_path" && |