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. -- 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