Re: Subtree in Git

[Junio C Hamano <gitster@pobox.com>]

greened@obbligato.org writes:

>> I basically did a: git subtree merge --prefix=contrib/subtree <my
>> git-subtree branch>
>>
>> The work in progress in on: https://github.com/helmo/git (the
>> subtree-updates branch)
>
> This branch seems to have a bunch of commits from master or some other
> branch:

Isn't the confusing shape of the history a direct result of what Herman
said he did above, i.e. use of "subtree merge"?  I thought that we agreed
not to do any more subtree merges for further updates when we slurped the
subtree history to contrib/ early in this cycle, so if that is the case,
Herman needs to rebase his work so that the integration will not need any
"subtree merge" into git.git, perhaps?

I looked at various branches found with ls-remote in that repository but I
couldn't quite tell which is what, with too many cross merges, among which
there are unnecessary duplicated commits (e.g. 90275824 and b9a745f7 seems
to be two equivalent commits) and questionable changes from the overall
project's point of view.

For example, it renames git-subtree.txt to README.md at a4416ee; while I
find the idea of departing from asciidoc somewhat attractive (perhaps this
is only because I haven't been burned by markdown yet), if "git subtree"
wants to live in the git.git repository, that change is a regression.
Later the file is renamed back to git-subtree.txt (README.md is lost) at
9ffdeb, a commit with a single-liner "fixing typo" log message adds the
README.md file with full contents of git-subtree.txt again at d9ccd03b,
and then later merge of the branch at 8861de28 finally decides to revert
that to have a shorter README.md that the history originally had, or
something.  In short, it is a mess.

Not very impressed, but I have this suspition that the history I was
looking at was not what was meant to be sent to me and an older
incarnation of the project before Herman cleaned it up for public
consumption, or something.

Confused...