Re: [PATCH] git-commit: revamp the git-commit semantics.

From: Junio C Hamano <junkio@cox.net>
Date: Feb 6, 2006, 00:03 UTC
Message-ID: <7vwtg9cq0k.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060205225116.GC24561@blinkenlights.visv.net>

Michael Fischer <michael@visv.net> writes:

[Michael, forgive me to respond in public -- which I know is against an established netiquette, but I think this comment is useful to people on the list in general.]

Show 12 quoted lines

> $ git-applymbox ../patch 
> 1 patch(es) to process.
>
> Applying 'git-commit: revamp the git-commit semantics.'
>
> error: Documentation/core-tutorial.txt: does not exist in index
> error: patch failed: git-commit.sh:213
> error: git-commit.sh: patch does not apply
>
> So, kind of hard to give an opinion on it.
>
> I've got 1.1.6 from a couple of days ago, downloaded source.

Ah, sorry, the development happens on the "master" branch. The maintenance release 1.1.6 has only fixes since 1.1.0 was done, and lacks all the new developments on the master branch.

Especially this update involves backward incompatible changes, it will _not_ appear in any of the future 1.1.X releases.

To keep yourself up to date:

	$ git clone git://git.kernel.org/pub/scm/git master.git
        $ cd master.git

This would give you the latest from the master branch that the patch would apply cleanly to.

It is in the the pu (proposed updates) branch, so once you make clone like this, you do not have to apply the patch yourself. Instead, you could find the commit that merges jc/commit topic branch on it:

        $ git show-branch --topo-order master pu

which probably would show something like this:

	...
         - [pu^] Merge branch 'jc/commit'
         + [pu^^2] git-commit: revamp the git-commit semantics.
        ...

The easiest way to try it out is:

	$ git checkout -b test pu^

Note: this would also get other topic branches merged on top of
master, but I consider them to be safe.  The rule of thumb is
that the closer to the tip of the "pu", the less ready the
change is to be of general use.

Then build it as usual.

	$ make && make install

Thanks.