Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-08-03 Thread Stefan Beller
On Wed, Jul 27, 2016 at 8:40 AM, Duy Nguyen wrote: > On Tue, Jul 26, 2016 at 8:15 PM, Stefan Beller wrote: >>> How to store stuff in .git is the implementation details that the user >>> does not care about. >> >> They do unfortunately. :( > > Well.. i mean the structure of .git. If .git gets big,

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-27 Thread Stefan Beller
Jakub wrote: > I think the problem with `--reference` is that it does not > setup backreferences to prevent gc removing borrowed objects; > which is a hard problem to solve, except for limited cases... > like git-worktree. Right. And instead of solving the reference problem, I'd rather solve the w

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-27 Thread Duy Nguyen
On Tue, Jul 26, 2016 at 8:15 PM, Stefan Beller wrote: >> How to store stuff in .git is the implementation details that the user >> does not care about. > > They do unfortunately. :( Well.. i mean the structure of .git. If .git gets big, yeah many people will get pissed. > My sudden interest in w

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-27 Thread Duy Nguyen
On Wed, Jul 27, 2016 at 6:10 AM, Max Kirillov wrote: > Hi. > > On Wed, Jul 20, 2016 at 07:24:18PM +0200, Nguyễn Thái Ngọc Duy wrote: >> + - `remote.*` added by submodules may be per working directory as >> + well, unless you are sure remotes from all possible submodules in >> + history are con

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-27 Thread Jakub Narębski
W dniu 2016-07-27 o 06:10, Max Kirillov pisze: > Hi. > > On Wed, Jul 20, 2016 at 07:24:18PM +0200, Nguyễn Thái Ngọc Duy wrote: >> + - `remote.*` added by submodules may be per working directory as >> + well, unless you are sure remotes from all possible submodules in >> + history are consisten

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-27 Thread Jakub Narębski
W dniu 2016-07-26 o 20:15, Stefan Beller pisze: > On Tue, Jul 26, 2016 at 10:20 AM, Duy Nguyen wrote: >> On Tue, Jul 26, 2016 at 1:25 AM, Stefan Beller wrote: >>> So what is the design philosophy in worktrees? How much independence does >>> one working tree have? >> >> git-worktree started out as

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-26 Thread Max Kirillov
Hi. On Wed, Jul 20, 2016 at 07:24:18PM +0200, Nguyễn Thái Ngọc Duy wrote: > + - `remote.*` added by submodules may be per working directory as > + well, unless you are sure remotes from all possible submodules in > + history are consistent. ... > @@ -1114,7 +1114,7 @@ cmd_sync() >

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-26 Thread Stefan Beller
On Tue, Jul 26, 2016 at 10:20 AM, Duy Nguyen wrote: > On Tue, Jul 26, 2016 at 1:25 AM, Stefan Beller wrote: >> So what is the design philosophy in worktrees? How much independence does >> one working tree have? > > git-worktree started out as an alternative for git-stash: hmm.. i need > to make s

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-26 Thread Duy Nguyen
On Tue, Jul 26, 2016 at 1:25 AM, Stefan Beller wrote: > So what is the design philosophy in worktrees? How much independence does > one working tree have? git-worktree started out as an alternative for git-stash: hmm.. i need to make some changes in another branch, okay let's leave this worktree

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-25 Thread Stefan Beller
On Fri, Jul 22, 2016 at 10:42 AM, Duy Nguyen wrote: > On Fri, Jul 22, 2016 at 7:25 PM, Stefan Beller wrote: >> On Fri, Jul 22, 2016 at 10:09 AM, Duy Nguyen wrote: >>> >>> I just quickly glanced through the rest of this mail because, as a >>> submodule ignorant, it's just mumbo jumbo to me. But w

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-25 Thread Junio C Hamano
Stefan Beller writes: > On Fri, Jul 22, 2016 at 9:55 AM, Junio C Hamano wrote: >> >> * submodule.$name.update, submodule.$name.ignore, >>submodule.$name.branch, etc. would need to be all different among >>worktrees of the superproject, as that is the whole point of >>being able to w

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Duy Nguyen
On Fri, Jul 22, 2016 at 7:25 PM, Stefan Beller wrote: > On Fri, Jul 22, 2016 at 10:09 AM, Duy Nguyen wrote: >> >> I just quickly glanced through the rest of this mail because, as a >> submodule ignorant, it's just mumbo jumbo to me. But what I see here >> is, there may be problems if we choose to

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Stefan Beller
On Fri, Jul 22, 2016 at 9:55 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> From a users POV there are: >> * non existent submodules (no gitlink recorded, no config set, >> no repo in place) >> * not initialized submodules (gitlink is recorded, no config set, >> and an empty repo is p

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Stefan Beller
On Fri, Jul 22, 2016 at 10:09 AM, Duy Nguyen wrote: > > I just quickly glanced through the rest of this mail because, as a > submodule ignorant, it's just mumbo jumbo to me. But what I see here > is, there may be problems if we choose to share some submodule info, > but I haven't seen any good thi

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Duy Nguyen
On Thu, Jul 21, 2016 at 1:22 AM, Stefan Beller wrote: > On Wed, Jul 20, 2016 at 10:24 AM, Nguyễn Thái Ngọc Duy > wrote: >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> Documentation/git-worktree.txt | 8 >> git-submodule.sh | 8 >> 2 files changed, 12 insertions

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Junio C Hamano
Stefan Beller writes: > From a users POV there are: > * non existent submodules (no gitlink recorded, no config set, > no repo in place) > * not initialized submodules (gitlink is recorded, no config set, > and an empty repo is put in the working tree as a place holder). This is no different

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Stefan Beller
On Fri, Jul 22, 2016 at 12:32 AM, Jens Lehmann wrote: > Am 21.07.2016 um 01:22 schrieb Stefan Beller: >> >> So maybe we want to drop that series and first talk about a migration plan >> from >> the current state to a world where we have the existence depending not >> on the url >> parameter, but a

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Jens Lehmann
Am 21.07.2016 um 01:22 schrieb Stefan Beller: So maybe we want to drop that series and first talk about a migration plan from the current state to a world where we have the existence depending not on the url parameter, but a boolean variable submodule... Depending on a submodule would be ignored

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-21 Thread Stefan Beller
FYI: I started working on a series that decouples existence of a submodule from the URL as a preparatory series to this one. Then we can have the same URL in all working trees, but the existence is configured differently for each working tree. I'll try to send it out tomorrow. Thanks, Stefan -- T

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-20 Thread Stefan Beller
On Wed, Jul 20, 2016 at 10:24 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > Documentation/git-worktree.txt | 8 > git-submodule.sh | 8 > 2 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/Documentation/git-worktree.

[PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 8 git-submodule.sh | 8 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 41350db..2a5661d 100644 --- a/Doc