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

Merge branch 'ff/submodule-no-fetch'

2009-02-15T09:44:20Z

* ff/submodule-no-fetch: submodule: add --no-fetch parameter to update command

submodule: warn about non-submodules

2009-02-07T20:49:58Z

Earlier, when you called git submodule some/bogus/path Git would silently ignore the path, without warning the user about the likely mistake. Now it does. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

submodule: add --no-fetch parameter to update command

2009-02-07T08:44:49Z

git submodule update --no-fetch makes it possible to use git submodule update in complete offline mode by not fetching new revisions. This does make sense in the following setup: * There is an unstable and a stable branch in the super/master repository. * The submodules might be at different revisions in the branches. * You are at some place without internet connection ;) With this patch it is now possible to change branches and update the submodules to be at the recorded revision without online access. Another advantage is that with -N the update operation is faster, because fetch is checking for new updates even if there was no fetch/pull on the super/master repository since the last update. Signed-off-by: Fabian Franz Signed-off-by: Junio C Hamano

submodule: use git rev-parse -q

2008-12-03T22:27:18Z

Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-11-11T22:49:50Z

* maint: Fix non-literal format in printf-style calls git-submodule: Avoid printing a spurious message. git ls-remote: make usage string match manpage Makefile: help people who run 'make check' by mistake

git-submodule: Avoid printing a spurious message.

2008-11-11T21:48:04Z

Fix 'git submodule update' to avoid printing a spurious "Maybe you want to use 'update --init'?" once for every uninitialized submodule it encounters. Signed-off-by: Alexandre Julliard Signed-off-by: Junio C Hamano

submodule: fix some non-portable grep invocations

2008-10-23T01:06:34Z

Not all greps support "-e", but in this case we can easily convert it to a single extended regex. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'bc/master-diff-hunk-header-fix'

2008-09-29T18:04:20Z

* bc/master-diff-hunk-header-fix: Clarify commit error message for unmerged files Use strchrnul() instead of strchr() plus manual workaround Use remove_path from dir.c instead of own implementation Add remove_path: a function to remove as much as possible of a path git-submodule: Fix "Unable to checkout" for the initial 'update' Clarify how the user can satisfy stash's 'dirty state' check. t4018-diff-funcname: test syntax of builtin xfuncname patterns t4018-diff-funcname: test syntax of builtin xfuncname patterns make "git remote" report multiple URLs diff hunk pattern: fix misconverted "\{" tex macro introducers diff: fix "multiple regexp" semantics to find hunk header comment diff: use extended regexp to find hunk headers diff: use extended regexp to find hunk headers diff.*.xfuncname which uses "extended" regex's for hunk header selection diff.c: associate a flag with each pattern and use it for compiling regex diff.c: return pattern entry pointer rather than just the hunk header pattern Conflicts: builtin-merge-recursive.c t/t7201-co.sh xdiff-interface.h

Merge branch 'maint' into bc/master-diff-hunk-header-fix

2008-09-29T17:52:34Z

* maint: (41 commits) Clarify commit error message for unmerged files Use strchrnul() instead of strchr() plus manual workaround Use remove_path from dir.c instead of own implementation Add remove_path: a function to remove as much as possible of a path git-submodule: Fix "Unable to checkout" for the initial 'update' Clarify how the user can satisfy stash's 'dirty state' check. Remove empty directories in recursive merge Documentation: clarify the details of overriding LESS via core.pager Update release notes for 1.6.0.3 checkout: Do not show local changes when in quiet mode for-each-ref: Fix --format=%(subject) for log message without newlines git-stash.sh: don't default to refs/stash if invalid ref supplied maint: check return of split_cmdline to avoid bad config strings builtin-prune.c: prune temporary packs in /pack directory Do not perform cross-directory renames when creating packs Use dashless git commands in setgitperms.perl git-remote: do not use user input in a printf format string make "git remote" report multiple URLs Start draft release notes for 1.6.0.3 git-repack uses --no-repack-object, not --no-repack-delta. ... Conflicts: RelNotes

git-submodule: Fix "Unable to checkout" for the initial 'update'

2008-09-29T15:24:19Z

Since commit 55218("checkout: do not lose staged removal"), in cmd_add/cmd_update, "git checkout " following "git clone -n" may fail if is different from HEAD. So Use "git checkout -f " to fix this. Signed-off-by: Ping Yin Signed-off-by: Shawn O. Pearce