undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/submodule-report-new-path-once'

Browse Source 
"git submodule init" used to report "registered for path ..."  even
for submodules that were registered earlier.

By Jens Lehmann
* jl/submodule-report-new-path-once:
  submodules: print "registered for path" message only once
This commit is contained in:
Junio C Hamano 2012-06-01 13:26:46 -07:00
commit 21e077fd46
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-submodule.sh
View File

@ -396,8 +396,9 @@ cmd_init()
module_list "$@" | module_list "$@" |
while read mode sha1 stage sm_path while read mode sha1 stage sm_path
do do
# Skip already registered paths
name=$(module_name "$sm_path") || exit name=$(module_name "$sm_path") || exit
# Copy url setting when it is not set yet
if test -z "$(git config "submodule.$name.url")" if test -z "$(git config "submodule.$name.url")"
then then
url=$(git config -f .gitmodules submodule."$name".url) url=$(git config -f .gitmodules submodule."$name".url)
@ -412,6 +413,8 @@ cmd_init()
esac esac
git config submodule."$name".url "$url" || git config submodule."$name".url "$url" ||
die "$(eval_gettext "Failed to register url for submodule path '\$sm_path'")" die "$(eval_gettext "Failed to register url for submodule path '\$sm_path'")"
say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$sm_path'")"
fi fi
# Copy "update" setting when it is not set yet # Copy "update" setting when it is not set yet
@ -420,8 +423,6 @@ cmd_init()
test -n "$(git config submodule."$name".update)" || test -n "$(git config submodule."$name".update)" ||
git config submodule."$name".update "$upd" || git config submodule."$name".update "$upd" ||
die "$(eval_gettext "Failed to register update mode for submodule path '\$sm_path'")" die "$(eval_gettext "Failed to register update mode for submodule path '\$sm_path'")"
say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$sm_path'")"
done done
} }