Re: contrib/ area

From: Junio C Hamano <junkio@cox.net>
Date: Feb 21, 2006, 03:58 UTC
Message-ID: <7v64n95pnm.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.OSX.4.64.0602201737260.16179@piva.hawaga.org.uk>

Ben Clifford <benc@hawaga.org.uk> writes:

Show 10 quoted lines

> I have been keeping some (lazily-maintained) bash completion code at:
>
> http://www.hawaga.org.uk/ben/tech/gitcompletion/
>
> It isn't clear to me whether it should stay there or be merged into
> git/contrib/.
> ...
> The path of least resistence for me is to keep it at the above
> hawaga.org.uk URL, but it may be that some people would prefer it in
> the main repos.

I am OK either way. They are small enough to be in contrib/ area, and bash users may appreciate easier availability. What I would _refuse_ to do is to maintain code for other people ;-). As long as you or somebody else is going to keep them updated as needed, I do not mind carrying them in contrib/.

As a practice for doing "even cooler merge", I did the following, to see if I can treat it just like I treat gitk.

    (1) give you a topic branch.
    $ git checkout -b bc/completion master

    (2) fetch your tip
    $ git fetch http://www.hawaga.org.uk/gitcompletion.git/

    (3) for a practice of a later "renaming" merge, pretend you were
        one rev behind than you actually are.
    $ COMMIT=`git rev-parse FETCH_HEAD^`

    (4) extract things under contrib/completion/
    $ git read-tree $COMMIT
    $ git checkout-index --prefix=contrib/completion/ -a

    (5) throw the index away, and add the files back into the real index.
    $ git reset
    $ git add contrib/completion

    (6) write the result of "even cooler merge" out, with a merge
        commit message:
    $ T=`git-write-tree`
    $ sed -e 's/^[0-9a-f]*/'$COMMIT/ <.git/FETCH_HEAD |
      git-fmt-merge-msg |
      git commit-tree $T -p `git rev-parse HEAD` -p $COMMIT

    (7) a practice of later merge
    $ git pull -s recursive http://www.hawaga.org.uk/gitcompletion.git/

The result is sitting at the tip of "pu" branch.