From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 1322420323 for ; Fri, 17 Mar 2017 03:28:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752945AbdCQD20 (ORCPT ); Thu, 16 Mar 2017 23:28:26 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:33515 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752017AbdCQD2M (ORCPT ); Thu, 16 Mar 2017 23:28:12 -0400 Received: by mail-wm0-f47.google.com with SMTP id v203so6534706wmg.0 for ; Thu, 16 Mar 2017 20:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=nrXO487wqwam+YeuR6I10tzq0ayglpcklJOv8lbYCAw=; b=a+vfJERTWpDx9xwhghxbc38fCel2v/RS2CTZkTWyz2OdKzFs9OTtyS0kg/crP8LOu+ 2FBaUnJOInrlVbTfxuQdqGGs1uvP5IGDnX94GxjuoisLqlYxbUCaxRMDUwFkCjr8p2Z3 7KB6TyknD4shzg8rgXcpBexi78+Ds3l30gYHSqR/I/0v/uBNdTb3qRtjJt6mxIEdgPW7 J0YxKCkm32Ndia7ncdEwFk+5MMqwz+YBBSmuP/O40+jBn8yJSVMjk+i6C6kZDHfELBIe ZJ87yHzzIuDUZkzpTtNX3rk3jpC8Xg76staqqF2ZDmm7/clNdsko14zVDA+g0j60jM8E IyZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=nrXO487wqwam+YeuR6I10tzq0ayglpcklJOv8lbYCAw=; b=CpTFHIVo2Unvo/Of3U3GD5IFLBqIZ97fzh/c/xj304i44yDyfBjGQ54K1bKa+SO/Gf 8WASgXmRiJObmtjCXUWaiz0MON7cGrK57+rJzcC2uJHB6buTCHjgnRhd6WQ2eGMZ1uo3 TglydmIwWAwo9QpneLzTnaNt4JNLxV35B/vYLsL81vyAX1MnXWv6eLDZR7iFQbipF/wG 5XzsB2OuOWjAe+T2JzKGCsigPufOQX3+ywXCN5am8fKc7RWKAh1+TBQizF5K3OmeOnHT /D4QEoxVs0ggK3iqcqd8cr3Ah67aRVBnxjclxxaDm68pilYzRnFCSTRRv2MXBUXsoqSK wa0w== X-Gm-Message-State: AFeK/H2W16RhkRDjIUU+oJ9TkDMhx9DnnJP3K/av/cBZ7YJ2fHmXZxK+rlsBzB2KR6+/Kg== X-Received: by 10.28.96.194 with SMTP id u185mr656310wmb.82.1489720735367; Thu, 16 Mar 2017 20:18:55 -0700 (PDT) Received: from [10.33.249.33] ([132.188.112.190]) by smtp.gmail.com with ESMTPSA id y4sm1883455wra.65.2017.03.16.20.18.53 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Mar 2017 20:18:54 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: USE_SHA1DC is broken in pu From: Lars Schneider In-Reply-To: Date: Fri, 17 Mar 2017 11:18:49 +0800 Cc: Git Mailing List , Linus Torvalds Content-Transfer-Encoding: quoted-printable Message-Id: <2B1DE627-11C8-4FA5-A354-76B6C475666A@gmail.com> References: To: Junio C Hamano X-Mailer: Apple Mail (2.3124) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org > On 17 Mar 2017, at 03:22, Linus Torvalds = wrote: >=20 > I think there's a semantic merge error and it clashes with > f18f816cb158 ("hash.h: move SHA-1 implementation selection into a > header file"). >=20 > Suggested possible merge resolution attached. >=20 > Linus > Would it make sense/have value to add a job to our TravisCI build [1]=20 that compiles Git in a few variations with some high profile switches=20 such as USE_SHA1DC? Running all the tests for these variations would=20 probably take to long but just compiling would be less than 2min per=20 variation. - Lars [1] https://travis-ci.org/git/git/branches=