From patchwork Wed Jan 27 16:37:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12050565 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CADCC433E0 for ; Wed, 27 Jan 2021 16:40:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0D3564DA1 for ; Wed, 27 Jan 2021 16:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232235AbhA0QkD (ORCPT ); Wed, 27 Jan 2021 11:40:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236547AbhA0QiK (ORCPT ); Wed, 27 Jan 2021 11:38:10 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F10AAC061786 for ; Wed, 27 Jan 2021 08:37:29 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id e15so2243078wme.0 for ; Wed, 27 Jan 2021 08:37:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=pisNovT6C10ETm6NcG5tg1QVupdeLMDbmISqKJUkms0=; b=SPCFPDYYdviGjyVjBmMLWwa+swyafzU+nL9XDLMUgapGHXbczAuMvEWJAlqifIaowN 9fFpV9Pc5y9WZHvRwlvJtI4drt0mW0zj0FMB7cp/+BW/dWJk6zqIk/B0exPYJXGKcyo0 LYJi99AEyeWNOvRefqQD5TK1UhhzaNlK5g0CJ8+uptFntNpPzjT8INo1z1zFZQhiPBWp J0SIx+wJMXFte63LBGFQHmZkjDrAQlCrfUaoHmnFrgw255DSmJl6iQ6uRNOP1HsAzGFJ CaDtTJ+kLpyJTJeIc7NoSxuefBl3r/LPP9AYEXvLBCNvhPGXCKwiHPZpyhnSA+K8HBec lvqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=pisNovT6C10ETm6NcG5tg1QVupdeLMDbmISqKJUkms0=; b=Ouwb03Xl5WNWBlhE1aelx0O4Mii9g34X5ccbugH8ugpuZeJiYWCNZd+cRbbQqKCKLy gNnCuYxSG9gqKV7vxTYbGIaTNFs64KA9Rkw204Fa7r3/krpE4ADbf9k+yusxAVf7hZtv rMx8lS8YOuXU0dicCqVu486t9AUNC5fkT5PCxMkcTJMd+Ackb91f2poaXU6U+UyrXdJh MLlIvEyDLqezp0IO6bqfNF0xHHud5qFTUl5YKJbxX1ofjgmkzdX6D2nCxYg8hppjbz/L YOjsdYYmJh7eO2Xd99pGTOcz271Grk3IR+5tHNTyDhDti8wP2+eBHF8WUpu9JQ0G3xfP cRtg== X-Gm-Message-State: AOAM530pX3tlPaaEoop/wLdm7tr5/dD08bhdimbdZWiutYoTkZJlDuDX xFhT9bvPYxA3Bjpz1+vooMfqw7ibEL0= X-Google-Smtp-Source: ABdhPJwqMch9Y5rG4F8Ibp1oxy0q3GKvi9uYWVG6plBQXndr7M1/pnVozLdBU63DejPINQmDJdI/9A== X-Received: by 2002:a1c:e443:: with SMTP id b64mr5026263wmh.136.1611765448587; Wed, 27 Jan 2021 08:37:28 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e11sm3245059wrt.35.2021.01.27.08.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 08:37:27 -0800 (PST) Message-Id: <0880ca587e63b252dc24d98b2e7590b2c0fcd881.1611765444.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 27 Jan 2021 16:37:23 +0000 Subject: [PATCH v3 2/3] range-diff/format-patch: handle commit ranges other than A..B Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , Eric Sunshine , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In the `SPECIFYING RANGES` section of gitrevisions[7], two ways are described to specify commit ranges that `range-diff` does not yet accept: "^!" and "^-". Let's accept them. Signed-off-by: Johannes Schindelin --- range-diff.c | 14 +++++++++++++- t/t3206-range-diff.sh | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/range-diff.c b/range-diff.c index 9b93e08e840..0c6ac4f954d 100644 --- a/range-diff.c +++ b/range-diff.c @@ -567,5 +567,17 @@ int show_range_diff(const char *range1, const char *range2, int is_range_diff_range(const char *arg) { - return !!strstr(arg, ".."); + static regex_t *regex; + + if (strstr(arg, "..")) + return 1; + + /* match `^!` and `^-` */ + if (!regex) { + regex = xmalloc(sizeof(*regex)); + if (regcomp(regex, "\\^(!|-[0-9]*)$", REG_EXTENDED) < 0) + BUG("could not compile range-diff regex"); + } + + return !regexec(regex, arg, 0, NULL, 0); } diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index 6eb344be031..e217cecac9e 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -150,6 +150,14 @@ test_expect_success 'simple A B C (unmodified)' ' test_cmp expect actual ' +test_expect_success 'A^! and A^- (unmodified)' ' + git range-diff --no-color topic^! unmodified^-1 >actual && + cat >expect <<-EOF && + 1: $(test_oid t4) = 1: $(test_oid u4) s/12/B/ + EOF + test_cmp expect actual +' + test_expect_success 'trivial reordering' ' git range-diff --no-color master topic reordered >actual && cat >expect <<-EOF &&