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

git-submodule - Fix bugs in adding an existing repo as a module

2008-07-08T23:37:25Z

git-submodule add would trip if path to the submodule included a space, or if its .git was a gitdir: link to a GIT_DIR kept elsewhere. Fix both. Signed-off-by: Mark Levedahl Signed-off-by: Junio C Hamano

git-submodule - Fix errors regarding resolve_relative_url

2008-06-14T18:34:00Z

git-submodule was invoking "die" from within resolve-relative-url, but this does not actually cause the script to exit. Fix this by returning the error to the caller and have the caller exit. While we're at it, clean up the quoting on invocation of resolve_relative_url as it was wrong. Signed-off-by: Mark Levedahl Signed-off-by: Junio C Hamano

Improve sed portability

2008-06-13T05:20:18Z

The behaviour of "sed" on an incomplete line is unspecified by POSIX, and On Solaris it apparently fails to process input that doesn't end in a LF. Consequently constructs like re=$(printf '%s' foo | sed -e 's/bar/BAR/g' $) cause re to be set to the empty string. Such a construct is used in git-submodule.sh. Because the LF at the end of command output are stripped away by the command substitution, it is a safe and sane change to add a LF at the end of the printf format specifier. Signed-off-by: Chris Ridd Signed-off-by: Junio C Hamano

submodule update: add convenience option --init

2008-05-16T20:03:55Z

When a submodule is not initialized and you do not want to change the defaults from .gitmodules anyway, you can now say $ git submodule update --init When "update" is called without --init on an uninitialized submodule, a hint to use --init is printed. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Use '-f' option to point to the .gitmodules file

2008-05-16T19:38:52Z

'git config' has a '-f' option that takes the file to parse. Using it rather than the environment variable seems more logical and simplified. Signed-off-by: Imran M Yousuf Signed-off-by: Junio C Hamano

Merge branch 'lh/git-file'

2008-05-06T02:16:16Z

* lh/git-file: Teach GIT-VERSION-GEN about the .git file Teach git-submodule.sh about the .git file Teach resolve_gitlink_ref() about the .git file Add platform-independent .git "symlink"

Merge branch 'py/submodule'

2008-04-20T04:11:29Z

* py/submodule: builtin-status: Add tests for submodule summary builtin-status: submodule summary support git-submodule summary: --for-status option

git-submodule - possibly use branch name to describe a module

2008-04-15T06:14:08Z

This changes the search logic for describing a submodule from: - annotated tag - any tag - tag on a subsequent commit - commit id to - annotated tag - any tag - tag on a subsequent commit - local or remote branch - commit id The change is describing with respect to a branch before falling back to the commit id. By itself, git-submodule will maintain submodules as headless checkouts without ever making a local branch. In general, such heads can always be described relative to the remote branch regardless of existence of tags, and so provides a better fallback summary than just the commit id. This requires inserting an extra describe step as --contains is incompatible with --all, but the latter can be used with --always to fall back to a commit ID. Also, --contains implies --tags, so the latter is not needed. Signed-off-by: Mark Levedahl Signed-off-by: Junio C Hamano

git-submodule summary: --for-status option

2008-04-13T03:00:45Z

The --for-status option is mainly used by builtin-status/commit. It adds 'Modified submodules:' line at top and '# ' prefix to all following lines. Signed-off-by: Ping Yin Signed-off-by: Junio C Hamano

git-submodule: Avoid 'fatal: cannot describe' message

2008-04-12T00:35:39Z

When "git submodule status" command tries to show the name of the submodule HEAD revision more descriptively, but the submodule repository lacked a suitable tag to do so, it leaked "fatal: cannot describe" message to the UI. Squelch it by using '--always'. Signed-off-by: Ping Yin Signed-off-by: Junio C Hamano