diff options
| -rw-r--r-- | .gitmodules | 9 | ||||
| -rw-r--r-- | README-GIT | 8 | ||||
| l---------[m---------] | libpkgconf | 1 | ||||
| m--------- | pkgconf | 0 |
4 files changed, 10 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index be801fd..923e17b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,10 +24,11 @@ path = libodb-sqlite url = https://scm.codesynthesis.com/odb/libodb-sqlite.git update = none -[submodule "libpkgconf"] - path = libpkgconf - url = https://git.build2.org/packaging/pkgconf/libpkgconf.git - update = none [submodule "sqlite"] path = sqlite url = https://git.build2.org/packaging/sqlite/sqlite.git + update = none +[submodule "pkgconf"] + path = pkgconf + url = https://git.build2.org/packaging/pkgconf/pkgconf.git + update = none @@ -25,15 +25,15 @@ A few additional notes: commits)' next to submodules (i.e., git "thinks" you have modified the member project by "setting back" its subproject commit). -2. The libpkgconf, libsqlite3 and libodb* submodules are not updated by default +2. The pkgconf, sqlite and libodb* submodules are not updated by default (e.g., with the above command). This is achieved with: - git config --file .gitmodules submodule.libsqlite3.update none + git config --file .gitmodules submodule.sqlite.update none Instead, their updates (normally to something tagged) must be requested explicitly: - git submodule update --remote --checkout libsqlite3 + git submodule update --remote --checkout sqlite Note that you need a fairly recent git (e.g., 2.9) for this enforcement - to work.
\ No newline at end of file + to work. diff --git a/libpkgconf b/libpkgconf -Subproject c9bb33b358a72cf91c648ad1cb6a19bf10f5bbd diff --git a/pkgconf b/pkgconf new file mode 160000 +Subproject a0cb8991b2cb61e9c0f3d8075759939cc61d57f |