Boost logo

Boost-Build :

Subject: Re: [Boost-build] Git directory structure
From: Bjørn Roald (bjorn_at_[hidden])
Date: 2013-12-09 00:05:26


On 12/09/2013 05:12 AM, Vladimir Prus wrote:
> On 09.12.2013 01:51, Dave Abrahams wrote:
>> Vladimir Prus <vladimir_at_[hidden]> writes:
>>
>>> It seems that after all is said and done, git repository for
>>> Boost.Build still features that 'v2' directory at the top. How do we
>>> recover this from this? I suppose I can run make a backup copy of
>>> current 'master' and 'develop' branches, 'git filter-branch' on master
>>> and develop with appropriate voodoo, then 'git push -f'. Does that
>>> seems OK in principle?
>>
>> Do _not_ rewrite history, or you will mess up the submodule references
>> in the super-project.
>
> It is trivial to update submodule references.
>
>> Historically, there was a v2 directory; we
>> decided that it wasn't the conversion's job to go back and change
>> history. If you want to get rid of the v2 director, just move
>> everything from v2 to its parent and delete v2 in a regular-old Git
>> commit.
>
> This thread shows that git won't properly show file history in this case
> without extra flags that apparently can't be set by default.

I guess you can use an alias, and there may be other ways. Maybe it can
be set default for the build repository, I don't know.

> It might be
> inside my 'passable' zone, but just barely, I'm not sure yet.

Personally I think it is more annoying that GitHub history do not
support --follow, supposedly it has been an issue in the past that they
said they would fix, but apparently nothing has happened.

--
Bjørn

Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk