git/git-submodule.sh, branch v1.7.9.7

submodule add: fix breakage when re-adding a deep submodule

2012-01-24T22:18:18Z

Since recently a submodule with name has its git directory in the .git/modules/ directory of the superproject while the work tree contains a gitfile pointing there. When the same submodule is added on a branch where it wasn't present so far (it is not found in the .gitmodules file), the name is not initialized from the path as it should. This leads to a wrong path entered in the gitfile when the .git/modules/ directory is found, as this happily uses the - now empty - name. It then always points only a single directory up, even if we have a path deeper in the directory hierarchy. Fix that by initializing the name of the submodule early in module_clone() if module_name() returned an empty name and add a test to catch that bug. Reported-by: Jehan Bing Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano

Merge branch 'tc/submodule-clone-name-detection'

2011-10-26T23:16:32Z

* tc/submodule-clone-name-detection: submodule::module_clone(): silence die() message from module_name() submodule: whitespace fix

submodule::module_clone(): silence die() message from module_name()

2011-10-21T17:02:02Z

The die() message that may occur in module_name() is not really relevant to the user when called from module_clone(); the latter handles the "failure" (no submodule mapping) anyway. Analysis of other callsites is left to future work. Acked-by: Jens Lehmann Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano

submodule: whitespace fix

2011-10-21T17:01:50Z

Replace SPs with TAB. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano

Merge branch 'fg/submodule-git-file-git-dir'

2011-10-10T22:56:17Z

* fg/submodule-git-file-git-dir: Move git-dir for submodules rev-parse: add option --resolve-git-dir Conflicts: cache.h git-submodule.sh

Merge branch 'js/i18n-scripts'

2011-08-25T23:00:16Z

* js/i18n-scripts: submodule: take advantage of gettextln and eval_gettextln. stash: take advantage of eval_gettextln pull: take advantage of eval_gettextln git-am: take advantage of gettextln and eval_gettextln. gettext: add gettextln, eval_gettextln to encode common idiom

Move git-dir for submodules

2011-08-23T04:03:38Z

Move git-dir for submodules into $GIT_DIR/modules/[name_of_submodule] of the superproject. This is a step towards being able to delete submodule directories without loosing the information from their .git directory as that is now stored outside the submodules work tree. This is done relying on the already existent .git-file functionality. When adding or updating a submodule whose git directory is found under $GIT_DIR/modules/[name_of_submodule], don't clone it again but simply point the .git-file to it and remove the now stale index file from it. The index will be recreated by the following checkout. This patch will not affect already cloned submodules at all. Tests that rely on .git being a directory have been fixed. Signed-off-by: Fredrik Gustafsson Mentored-by: Jens Lehmann Mentored-by: Heiko Voigt Signed-off-by: Junio C Hamano

Merge branch 'jl/submodule-update-quiet'

2011-08-08T19:33:34Z

* jl/submodule-update-quiet: submodule: update and add must honor --quiet flag

submodule: take advantage of gettextln and eval_gettextln.

2011-08-08T19:05:27Z

Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

submodule: update and add must honor --quiet flag

2011-07-28T19:48:26Z

When using the --quiet flag "git submodule update" and "git submodule add" didn't behave as the documentation stated. They printed progress output from the clone, even though they should only print error messages. Fix that by passing the -q flag to git clone in module_clone() when the GIT_QUIET variable is set. Two tests in t7400 have been modified to test that behavior. Reported-by: Daniel Holtmann-Rice Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano