git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: USE_SHA1DC is broken in pu
Date: Thu, 16 Mar 2017 15:41:10 -0400	[thread overview]
Message-ID: <20170316194110.756ipu7xud2s3w2m@sigill.intra.peff.net> (raw)
In-Reply-To: <CA+55aFzJ3NFVoN6K9__nM_LWYfegxGo_YxB0OudTNBCG+qq+3Q@mail.gmail.com>

On Thu, Mar 16, 2017 at 12:22:00PM -0700, Linus Torvalds wrote:

> I think there's a semantic merge error and it clashes with
> f18f816cb158 ("hash.h: move SHA-1 implementation selection into a
> header file").
> 
> Suggested possible merge resolution attached.

Yeah, your resolution makes sense.

Potentially we should just eject sha1dc from "pu" for the moment. It
needs re-rolled with the most recent version of the collision library
(and I see Marc just posted that they hit a stable point, which is
perhaps why you're looking at it).

I'd planned to work on that in the next few days, but if you want to do
so, be my guest.

-Peff

  reply	other threads:[~2017-03-16 19:41 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-16 19:22 USE_SHA1DC is broken in pu Linus Torvalds
2017-03-16 19:41 ` Jeff King [this message]
2017-03-16 19:44   ` Linus Torvalds
2017-03-16 19:46     ` Junio C Hamano
2017-03-16 19:51       ` Linus Torvalds
2017-03-16 20:26         ` Linus Torvalds
2017-03-16 19:41 ` Junio C Hamano
2017-03-17  3:18 ` Lars Schneider
2017-03-17  3:32   ` Lars Schneider
2017-03-21 20:09     ` Johannes Schindelin
2017-03-21 20:16       ` Junio C Hamano
2017-03-22 14:32         ` Johannes Schindelin
2017-03-22 22:02           ` Jonathan Nieder
2017-03-23 16:43             ` Johannes Schindelin
2017-03-23 17:16               ` Linus Torvalds
2017-03-23 17:47                 ` Jeff King
2017-03-23 19:02                   ` Junio C Hamano
2017-03-23 22:22               ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170316194110.756ipu7xud2s3w2m@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).