Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes:
> On Fri, May 17, 2013 at 12:53 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> David Aguilar <davvid@xxxxxxxxx> writes:
>>
>>> Do you have advice on how we should proceed? :sigh: sorry for wasting
>>> so much maintainer time on this series already. If you need any
>>> resends or anything please let me know. This time I'll wait for a
>>> strong opinion before firing off patches.
>>>
>>> My opinion: yeah, v5's ([NO_]APPLE_COMMON_CRYPTO) was probably where
>>> we should have stopped painting. Hindsight is 20/20. Luckily it
>>> never left "pu".
>>
>> I could do this easily:
>>
>> $ git checkout da/darwin ;# b72ac20a6f73b
>> $ git format-patch --stdout -2 |
>> sed -e 's|COMMON_DIGEST_FOR_OPENSSL|APPLE_COMMON_CRYPTO|g' >P.mbox
>> $ git checkout HEAD^^ ;# 29de20504e
>> $ git am P.mbox
>> $ git diff da/darwin HEAD ;# sanity check
>> $ git log da/darwin.. ;# sanity check
>> $ git branch -f da/darwin
>
> That would lose the one legitimate COMMON_DIGEST_FOR_OPENSSL which
> needs to be defined before <CommonCrypto/CommonDigest.h> is included.
It probably is a good catch, but I'll stop reading patches and start
today's integration cycle (and will tag 1.8.3-rc3).
At this point, I think the best would be for you to reroll these two
patches, then after David reviews it and I'd re-queue the result
with
... original commit message ...
Reorginized use of Makefile variables and C preprosessor
macros with help by Eric Sunshine.
Signed-off-by: David
Signed-off-by: Eric
Signed-off-by: Me
or something. Can you two help that?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html