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.5 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham 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 6720220C11 for ; Tue, 5 Dec 2017 06:55:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751934AbdLEGzR (ORCPT ); Tue, 5 Dec 2017 01:55:17 -0500 Received: from cloud.peff.net ([104.130.231.41]:48308 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751325AbdLEGzQ (ORCPT ); Tue, 5 Dec 2017 01:55:16 -0500 Received: (qmail 29707 invoked by uid 109); 5 Dec 2017 06:55:16 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Tue, 05 Dec 2017 06:55:16 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 29811 invoked by uid 111); 5 Dec 2017 06:55:37 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.94) with ESMTPA; Tue, 05 Dec 2017 01:55:37 -0500 Authentication-Results: peff.net; auth=pass (cram-md5) smtp.auth=relayok Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Tue, 05 Dec 2017 01:55:14 -0500 Date: Tue, 5 Dec 2017 01:55:14 -0500 From: Jeff King To: =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason Cc: git@vger.kernel.org, Junio C Hamano , Takashi Iwai Subject: Re: [PATCH 2/4] sha1dc_git.h: re-arrange an ifdef chain for a subsequent change Message-ID: <20171205065514.GB4788@sigill.intra.peff.net> References: <20171128213214.12477-1-avarab@gmail.com> <20171128213214.12477-3-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20171128213214.12477-3-avarab@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Nov 28, 2017 at 09:32:12PM +0000, Ævar Arnfjörð Bjarmason wrote: > A subsequent change will change the semantics of DC_SHA1_SUBMODULE in > a way that would require moving these checks around, so start by > moving them around without any functional changes. OK. This flips the priority, but we're assuming that the Makefile doesn't allow you to actually set both flags (at least not easily). And I think that is the case, even after your loosening of the error for "auto" in the previous patch, because the whole DC_SHA1_SUBMODULE code-path is in the "else" block for DC_SHA1_EXTERNAL. Good. -Peff