user/sven/git.git/git-submodule.sh, branch v1.8.0.2

git-submodule: wrap branch option with "<>" in usage strings.

2012-10-25T08:46:13Z

Use "-b " instead of "-b branch". This brings the usage strings in line with other options, e.g. "--reference ". Signed-off-by: W. Trevor King Signed-off-by: Jeff King

Merge branch 'rr/maint-submodule-unknown-cmd'

2012-09-30T05:28:33Z

* rr/maint-submodule-unknown-cmd: submodule: if $command was not matched, don't parse other args

submodule: if $command was not matched, don't parse other args

2012-09-25T18:31:48Z

"git submodule" command DWIMs the command line and assumes a unspecified action word for 'status' action. This is a UI mistake that leads to a confusing behaviour. A mistyped command name is instead treated as a request for 'status' of the submodule with that name, e.g. $ git submodule show error: pathspec 'show' did not match any file(s) known to git. Did you forget to 'git add'? Stop DWIMming an unknown or mistyped subcommand name as pathspec given to unspelled "status" subcommand. "git submodule" without any argument is still interpreted as "git submodule status", but its value is questionable. Adjust t7400 to match, and stop advertising the default subcommand being 'status' which does not help much in practice, other than promoting laziness and confusion. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano

Merge branch 'sz/submodule-force-update' into maint-1.7.11

2012-09-11T18:10:17Z

* sz/submodule-force-update: Make 'git submodule update --force' always check out submodules.

Merge branch 'sz/submodule-force-update'

2012-09-03T22:54:18Z

"git submodule update --force" used to leave the working tree of the submodule intact when there were local changes. It is more intiutive to make "--force" a sign to run "checkout -f" to overwrite them. * sz/submodule-force-update: Make 'git submodule update --force' always check out submodules.

Merge branch 'hv/submodule-path-unmatch'

2012-08-29T21:50:15Z

* hv/submodule-path-unmatch: Let submodule command exit with error status if path does not exist

Make 'git submodule update --force' always check out submodules.

2012-08-24T16:00:43Z

Currently, it will only do a checkout if the sha1 registered in the containing repository doesn't match the HEAD of the submodule, regardless of whether the submodule is dirty. As discussed on the mailing list, the '--force' flag is a strong indicator that the state of the submodule is suspect, and should be reset to HEAD. Signed-off-by: Stefan Zager Acked-by: Jens Lehmann Signed-off-by: Junio C Hamano

Let submodule command exit with error status if path does not exist

2012-08-14T21:00:17Z

Various subcommands of the "git submodule" command exited with 0 status even though the path given by the user did not exist. The reason behind that was that they all pipe the output of module_list into the while loop which then does the action on the paths specified by the commandline. Since the exit code of the command on the upstream side of the pipe is ignored by the shell, the status code of "ls-files --error-unmatch" nor "module_list" was not propagated. In case ls-files returns with an error code, we write a special string that is not possible in non error situations, and no other output, so that the downstream can detect the error and die with an error code. The error message that there is an unmatched pathspec comes through stderr directly from ls-files. So the user still gets a hint whats going on. Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano

Merge branch 'jx/i18n-1.7.11'

2012-07-31T16:41:52Z

Add i18n support for scripted Porcelains, and mark strings in merge(-recursive), am, and rebase for i18n. * jx/i18n-1.7.11: i18n: merge-recursive: mark strings for translation Remove dead code which contains bad gettext block i18n: am: mark more strings for translation rebase: remove obsolete and unused LONG_USAGE which breaks xgettext i18n: Rewrite gettext messages start with dash i18n: rebase: mark messages for translation i18n: New keywords for xgettext extraction from sh

Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint

2012-07-30T20:04:18Z

When "git submodule add" clones a submodule repository, it can get confused where to store the resulting submodule repository in the superproject's .git/ directory when there is a symbolic link in the path to the current directory. * jl/maint-1.7.10-recurse-submodules-with-symlink: submodules: don't stumble over symbolic links when cloning recursively