From: Todd A. Jacobs <tjacobs@si2services.com>
Date: Wed, 25 Aug 2010 07:20:28 GMT
Subject: Re: Bug report: %h for abbreviated hashes broken after 1.7.1
Message-ID: <AANLkTimebn+p9dcUWQiUPT8WwC-tuPpTM8M+ptq4Q9uc@mail.gmail.com>
In-Reply-To: <20100825062403.GA15858@burratino>

> As you know, in a distributed development model, history is not
> linear.  It is possible to have multiple lines of development by
> people who are not aware of each other:

Fair enough. Thank you for taking the time to explain further. I guess
I still don't understand how both the patch and the tag are both on
the master branch:

    $ git branch --contains v1.7.2.2
    * master

    $ git branch --contains 35039ce
    * master

while still not being exported at v1.7.2.2. Diffing:

    git diff 35039ce v1.7.2.2 -- archive.c

still shows the patch unapplied, but I can't understand why since both
commits are on the same branch. What I'm not seeing is where it's
unapplied, reverted, or otherwise stripped out of the progression
along master. What am I missing here?

Meanwhile, whether it isn't merged in, or because the patch doesn't
work/was reverted/won the lottery/took a vacation, the bottom line is
that the last two releases of git Do The Wrong Thing (tm) with
export-subst strings when called by git-archive.

I'd really like to know (for my own git-knowledge growth) how to
figure out where the patch went, if not up the master tree, but in the
end all I want is the right functionality back. :)