Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-08 Thread Max Kirillov
On Mon, Dec 08, 2014 at 09:40:59PM +0100, Jens Lehmann wrote: > Huh? I think we already have that: If you ignore the url > config it's as if the submodule was never initialized, so > you can just *not* run the "git submodule update" command > at all to get that effect. No new option needed ;-) You

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-08 Thread Jens Lehmann
Am 07.12.2014 um 07:42 schrieb Max Kirillov: On Sat, Dec 06, 2014 at 02:06:08PM +0100, Jens Lehmann wrote: Am 05.12.2014 um 07:32 schrieb Max Kirillov: Currently I'm estimating approach when submodules which have .git file or directory inside are updated, and those which do not have it are not.

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-07 Thread Max Kirillov
On Sun, Dec 07, 2014 at 08:42:30AM +0200, Max Kirillov wrote: >> *) I'd love to see a solution for sharing the object database >>between otherwise unrelated clones of the same project (so >>that fetching in one clone updates the objects in the common >>dir and gc cannot throw anything a

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-06 Thread Max Kirillov
On Sat, Dec 06, 2014 at 02:06:08PM +0100, Jens Lehmann wrote: > Am 05.12.2014 um 07:32 schrieb Max Kirillov: >> Currently I'm estimating approach when submodules which have .git >> file or directory inside are updated, and those which do not have it are not. >> I have added a config variable submod

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-06 Thread Jens Lehmann
Am 05.12.2014 um 07:32 schrieb Max Kirillov: On Thu, Dec 4, 2014 at 10:06 PM, Jens Lehmann wrote: But I'd need to have separate settings for our CI server, e.g. to checkout the sources without the largish documentation submodule in one test job (=worktree) while checking out the whole documenta

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-06 Thread Jens Lehmann
Am 05.12.2014 um 02:33 schrieb Duy Nguyen: On Fri, Dec 5, 2014 at 3:06 AM, Jens Lehmann wrote: Wow, so the .git/config is shared between all worktrees? I suspect you have very good reasons for that, most of config vars are at repo-level, not worktree-level, except maybe submodule.* and someth

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-04 Thread Max Kirillov
On Thu, Dec 4, 2014 at 10:06 PM, Jens Lehmann wrote: > But I'd need to have separate settings for > our CI server, e.g. to checkout the sources without the > largish documentation submodule in one test job (=worktree) > while checking out the whole documentation for another job > building the setu

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-04 Thread Duy Nguyen
On Fri, Dec 5, 2014 at 3:06 AM, Jens Lehmann wrote: > Wow, so the .git/config is shared between all worktrees? I > suspect you have very good reasons for that, most of config vars are at repo-level, not worktree-level, except maybe submodule.* and something else. Technically we could use "include

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-04 Thread Jens Lehmann
Am 02.12.2014 um 23:16 schrieb Max Kirillov: On Tue, Dec 02, 2014 at 09:45:24PM +0100, Jens Lehmann wrote: But, while hacking the submodule init I became more convinced that the modules directory should be common and submodules in checkout should be a checkouts of the submodule. Because this is

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-02 Thread Max Kirillov
On Tue, Dec 02, 2014 at 09:45:24PM +0100, Jens Lehmann wrote: >> But, while hacking the submodule init I became more >> convinced that the modules directory should be common and >> submodules in checkout should be a checkouts of the >> submodule. Because this is looks like concept of >> submodules,

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-02 Thread Jens Lehmann
Am 01.12.2014 um 00:27 schrieb Max Kirillov: builtin/checkout.c: use absolute path instead of given argument for picking worktree name, it happens to be needed because for submodule checkout the new worktree is always "." environment.c: add GIT_COMMON_DIR to local_repo_env git-submodule.sh: i

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-01 Thread Max Kirillov
On Mon, Dec 01, 2014 at 05:43:16PM +0700, Duy Nguyen wrote: > On Mon, Dec 1, 2014 at 6:27 AM, Max Kirillov wrote: >> But, while hacking the submodule init I became more >> convinced that the modules directory should be common and >> submodules in checkout should be a checkouts of the >> submodule.

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-01 Thread Duy Nguyen
On Mon, Dec 1, 2014 at 6:27 AM, Max Kirillov wrote: > But, while hacking the submodule init I became more convinced that the > modules directory should be common and submodules in checkout should be > a checkouts of the submodule. Because this is looks like concept of > submodules, that they are u

[PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-11-30 Thread Max Kirillov
builtin/checkout.c: use absolute path instead of given argument for picking worktree name, it happens to be needed because for submodule checkout the new worktree is always "." environment.c: add GIT_COMMON_DIR to local_repo_env git-submodule.sh: implement automatic cloning of main repository an