Re: [PATCHv8 6/6] submodule: add absorb-git-dir function

2016-12-19 Thread Duy Nguyen
On Tue, Dec 20, 2016 at 1:15 AM, Stefan Beller wrote: > On Sun, Dec 18, 2016 at 9:35 PM, Duy Nguyen wrote: >> On Mon, Dec 12, 2016 at 11:04:35AM -0800, Stefan Beller wrote: >>> diff --git a/dir.c b/dir.c >>> index e0efd3c2c3..d872cc1570 100644 >>> --- a/dir.c >>> +++ b/dir.c >>> @@ -2773,3 +2773,

Re: [PATCHv8 6/6] submodule: add absorb-git-dir function

2016-12-19 Thread Stefan Beller
On Sun, Dec 18, 2016 at 9:35 PM, Duy Nguyen wrote: > On Mon, Dec 12, 2016 at 11:04:35AM -0800, Stefan Beller wrote: >> diff --git a/dir.c b/dir.c >> index e0efd3c2c3..d872cc1570 100644 >> --- a/dir.c >> +++ b/dir.c >> @@ -2773,3 +2773,15 @@ void connect_work_tree_and_git_dir(const char >> *work_t

Re: [PATCHv8 6/6] submodule: add absorb-git-dir function

2016-12-18 Thread Duy Nguyen
On Mon, Dec 12, 2016 at 11:04:35AM -0800, Stefan Beller wrote: > diff --git a/dir.c b/dir.c > index e0efd3c2c3..d872cc1570 100644 > --- a/dir.c > +++ b/dir.c > @@ -2773,3 +2773,15 @@ void connect_work_tree_and_git_dir(const char > *work_tree_, const char *git_dir_) > free(work_tree); >

[PATCHv8 6/6] submodule: add absorb-git-dir function

2016-12-12 Thread Stefan Beller
When a submodule has its git dir inside the working dir, the submodule support for checkout that we plan to add in a later patch will fail. Add functionality to migrate the git directory to be absorbed into the superprojects git directory. The newly added code in this patch is structured such tha