git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Adam Dinwoodie" <adam@dinwoodie.org>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Liam R . Howlett" <Liam.Howlett@oracle.com>,
	"Michael Kebe" <michael.kebe@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 0/3] update sha1dc
Date: Tue,  6 Jun 2017 15:12:28 +0000	[thread overview]
Message-ID: <20170606151231.25172-1-avarab@gmail.com> (raw)
In-Reply-To: <20170606124323.GD25777@dinwoodie.org>

This updates sha1dc fixing the issue on Cygwin introduced in 2.13.1,
and hopefully not regressing elsewhere. Liam, it would be much
appreciated if you could test this on SPARC.

As before the "sha1dc: update from upstream" patch is what should
fast-track to master/maint and be in 2.13.2, the other two are the
cooking submodule use, that's all unchanged aside from of course the
submodule pointing to the same upstream commit as the code import
itself does.

Junio: There's a whitespace change to sha1.h that am warns about, but
which it applies anyway that you didn't apply from my previous
patch. I think it probably makes sense to just take upstream's
whitespace shenanigans as-is instead of seeing that diff every time we
update. I guess we could also send them a pull request...

Junio C Hamano (1):
  sha1collisiondetection: automatically enable when submodule is
    populated

Ævar Arnfjörð Bjarmason (2):
  sha1dc: update from upstream
  sha1dc: optionally use sha1collisiondetection as a submodule

 .gitmodules            |  4 ++++
 Makefile               | 16 ++++++++++++++++
 hash.h                 |  4 ++++
 sha1collisiondetection |  1 +
 sha1dc/sha1.c          | 30 ++++++++++++++++++++++++------
 sha1dc/sha1.h          |  6 +++---
 6 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 sha1collisiondetection

-- 
2.13.0.506.g27d5fe0cd


  parent reply	other threads:[~2017-06-06 15:12 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-05 20:34 Git v2.13.1 SHA1 very broken Adam Dinwoodie
2017-06-05 21:05 ` Ævar Arnfjörð Bjarmason
2017-06-05 23:20   ` Ramsay Jones
2017-06-06  0:11     ` Ramsay Jones
2017-06-06  1:20   ` Junio C Hamano
2017-06-06 10:03     ` Adam Dinwoodie
2017-06-06 11:55       ` Junio C Hamano
2017-06-06 12:43         ` Adam Dinwoodie
2017-06-06 14:47           ` Continous Integration (was: RE: Git v2.13.1 SHA1 very broken) Jason Pyeron
2017-06-06 15:04             ` Lars Schneider
2017-07-02 20:35               ` Adam Dinwoodie
2017-07-03 12:34                 ` Johannes Schindelin
2017-06-06 15:12           ` Ævar Arnfjörð Bjarmason [this message]
2017-06-06 15:12             ` [PATCH 1/3] sha1dc: update from upstream Ævar Arnfjörð Bjarmason
2017-06-06 15:12             ` [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-06 18:48               ` Stefan Beller
2017-06-06 19:03                 ` Ævar Arnfjörð Bjarmason
2017-06-06 19:09                   ` Stefan Beller
2017-06-06 15:12             ` [PATCH 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
2017-06-06 18:23             ` [PATCH 0/3] update sha1dc Stefan Beller
2017-06-06 18:51               ` Ævar Arnfjörð Bjarmason
2017-06-06 19:01                 ` [PATCH] sha1dc: ignore indent-with-non-tab whitespace violations Jeff King
2017-06-06 19:04                   ` Ævar Arnfjörð Bjarmason
2017-06-06 19:05                   ` Stefan Beller
2017-06-13  2:09             ` [PATCH 0/3] update sha1dc Liam R. Howlett
2017-06-06 12:49         ` Git v2.13.1 SHA1 very broken Morten Welinder

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=20170606151231.25172-1-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=Liam.Howlett@oracle.com \
    --cc=adam@dinwoodie.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=michael.kebe@gmail.com \
    --cc=ramsay@ramsayjones.plus.com \
    /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).