From patchwork Thu Jan 27 19:08:27 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Johannes Schindelin <johannes.schindelin@gmx.de>
X-Patchwork-Id: 12727200
Return-Path: <git-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 75019C4332F
	for <git@archiver.kernel.org>; Thu, 27 Jan 2022 19:08:35 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S245441AbiA0TIf (ORCPT <rfc822;git@archiver.kernel.org>);
        Thu, 27 Jan 2022 14:08:35 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59158 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229628AbiA0TIe (ORCPT <rfc822;git@vger.kernel.org>);
        Thu, 27 Jan 2022 14:08:34 -0500
Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com
 [IPv6:2a00:1450:4864:20::333])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B8A6C061714
        for <git@vger.kernel.org>; Thu, 27 Jan 2022 11:08:34 -0800 (PST)
Received: by mail-wm1-x333.google.com with SMTP id
 c190-20020a1c9ac7000000b0035081bc722dso2485096wme.5
        for <git@vger.kernel.org>; Thu, 27 Jan 2022 11:08:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20210112;
        h=message-id:in-reply-to:references:from:date:subject:fcc
         :content-transfer-encoding:mime-version:to:cc;
        bh=Iwq7WehpMs5Yl9L12/kZ1dSjIALu6riIJpTzPAUgSOM=;
        b=cvEFxvKx5GP6QJQUwCEiIp0qkV+5IpJKhEKEzXj3nS45Tq0x5op9YVfv7HtooY5LOs
         cZIazWevv4+eh5PYwKNDZKgPT904ItgUgJvxsjIBm9Atk8/1SkXmOC8do/xoo12QaOBy
         5TnTxA12rCQAziEs+5A+wpt2K/fNi/PWTNsqRc4+LN0ujhAvDkSOBzNFst1PHPOUvSLd
         +xan8uTg4fE1VDfgyTHbCnpQSpJevCy8qJAngyynNWyHwz6kDaOB7qzAeATcRZW1PXs2
         +6U000IqKlxG6w5rCOHZlg7qSF8clRvCLcYS5QQqq/g+ghcAMNDcWDHBK4idXU45SdAy
         zK2g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:in-reply-to:references:from:date
         :subject:fcc:content-transfer-encoding:mime-version:to:cc;
        bh=Iwq7WehpMs5Yl9L12/kZ1dSjIALu6riIJpTzPAUgSOM=;
        b=Z6cgsd9TnXohbIkFt8hPHJHZ68BjBsbZSQJGCX4A3dXtbxJxiXhdkM33jHsdWLuO79
         5cmlVYJhlMzC5pjt4zUGxWwST7R30iYuovjm5HhtjcC4N3TpWSpgH5knZtW1/YDGLb5h
         repg5ORyLWSdiifmNEvn0vedF1l/E91l0l1dBZca+7YgU6Evb4z9Jn9pQOs39fjMnX+5
         iLZcVjGS/nUdX5BHPA7Ths0BHW22le6cNNeoI6Yvg1ECn7Ytmf5yWCtKMLj0r6T3GmDs
         3NJUWOGVt2E9gz0lH/yKc1hWP7QMUUocJtmHCKHRpuPZ51sE7DmVXZ02HDoe3LmzHbb6
         xHbw==
X-Gm-Message-State: AOAM530SHxZmx724v5a5PnOSd1bmgM9loQvRyiYk0To6Aooss9aNA0h/
        aXiupJYoAWZvdca40UiBlih6biANk0Y=
X-Google-Smtp-Source: 
 ABdhPJwRIPqzwquW7W2JBUHPDReUDfWEneIGGBK7k2GlQvdnp/2EGMvGZF+vp0eyFfehkFUaqcB+9A==
X-Received: by 2002:a05:600c:17d5:: with SMTP id
 y21mr4528764wmo.102.1643310512324;
        Thu, 27 Jan 2022 11:08:32 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id 16sm128330wmj.12.2022.01.27.11.08.31
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Thu, 27 Jan 2022 11:08:31 -0800 (PST)
Message-Id: 
 <704bb2ba18ee3af5857064f6fd61689f98da0480.1643310510.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1127.v2.git.1643310510.gitgitgadget@gmail.com>
References: <pull.1127.git.1643149759.gitgitgadget@gmail.com>
        <pull.1127.v2.git.1643310510.gitgitgadget@gmail.com>
Date: Thu, 27 Jan 2022 19:08:27 +0000
Subject: [PATCH v2 1/3] docs(diff): lose incorrect claim about `diff-files
 --diff-filter=A`
Fcc: Sent
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Taylor Blau <me@ttaylorr.com>,
 =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason  <avarab@gmail.com>,
 Johannes Schindelin <johannes.schindelin@gmx.de>,
 Johannes Schindelin <johannes.schindelin@gmx.de>
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
From: Johannes Schindelin <johannes.schindelin@gmx.de>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

Originally, before we had `--intent-to-add`, there was no way that `git
diff-files` could see added files: if a file did not exist in the index,
`git diff-files` would not show it because it looks only at worktree
files when there is an index entry at the same path.

We used this example in the documentation of the diff options to explain
that not every `--diff-filter=<option>` has an effect in all scenarios.

Even when we added `--intent-to-add`, the comment was still correct,
because initially we showed such files as modified instead of added.

However, when that bug was fixed in feea6946a5b (diff-files: treat
"i-t-a" files as "not-in-index", 2020-06-20), the comment in the
documentation became incorrect.

Let's just remove it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/diff-options.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c89d530d3d1..2549df0d212 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -616,11 +616,8 @@ ifndef::git-format-patch[]
 Also, these upper-case letters can be downcased to exclude.  E.g.
 `--diff-filter=ad` excludes added and deleted paths.
 +
-Note that not all diffs can feature all types. For instance, diffs
-from the index to the working tree can never have Added entries
-(because the set of paths included in the diff is limited by what is in
-the index).  Similarly, copied and renamed entries cannot appear if
-detection for those types is disabled.
+Note that not all diffs can feature all types. For instance, copied and
+renamed entries cannot appear if detection for those types is disabled.
 
 -S<string>::
 	Look for differences that change the number of occurrences of

From patchwork Thu Jan 27 19:08:28 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Johannes Schindelin <johannes.schindelin@gmx.de>
X-Patchwork-Id: 12727201
Return-Path: <git-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 897BEC433F5
	for <git@archiver.kernel.org>; Thu, 27 Jan 2022 19:08:37 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S245443AbiA0TIf (ORCPT <rfc822;git@archiver.kernel.org>);
        Thu, 27 Jan 2022 14:08:35 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59162 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S245436AbiA0TIf (ORCPT <rfc822;git@vger.kernel.org>);
        Thu, 27 Jan 2022 14:08:35 -0500
Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com
 [IPv6:2a00:1450:4864:20::434])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB3E3C061714
        for <git@vger.kernel.org>; Thu, 27 Jan 2022 11:08:34 -0800 (PST)
Received: by mail-wr1-x434.google.com with SMTP id s18so6529552wrv.7
        for <git@vger.kernel.org>; Thu, 27 Jan 2022 11:08:34 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20210112;
        h=message-id:in-reply-to:references:from:date:subject:fcc
         :content-transfer-encoding:mime-version:to:cc;
        bh=DYuGb9rSkace8bGLkTMmHIMDj91JTpOlwsxg0hTlXNo=;
        b=XliGmwBlzz/LOc7VYhAxLyeI3a2kDJD9p8rLFdA/xIXLzvAcp86Vg3wwrsntb++3hD
         W8OAceDc9zLH5SQcbHG1C3XbKRlSlzjuhxsiKBGJgC5ircb/jII9cnMhqf7kX6wYoOdy
         fp2/RZTmzLW8a4IVllbNN1ROO1bRBf1OjO06lf4z5lQ/XwuMvinJYpCsFMdt8IOysGxM
         kOGSNEBFR5pK5CdkxBwtOxNvDvUEcj2026kg1b7LCGGO6/DvZUFm/AsTdis+UIPRl4S3
         CFGaJjE/hdpFgqaGf5Y1s6L4l5HgfnBsqKaER5b7dDFrxx/1j4DaOSolCI0FxT6OSiNd
         0Dgw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:in-reply-to:references:from:date
         :subject:fcc:content-transfer-encoding:mime-version:to:cc;
        bh=DYuGb9rSkace8bGLkTMmHIMDj91JTpOlwsxg0hTlXNo=;
        b=ba+NK/xMCVvBn34PljKDH4oP2JC5ChdS+m0b9T1UnMPWUy4qNjPDL8U7q6OmZbEmUJ
         GLjpB9M4oa+3TXjxKj95A6EyaRvmuh8FOsZ1hbFIv/vU4JrqHXBRQffGqy6K0rcf++9R
         Rx784Sjs/9gniQyQ2Ym25ZN1XBzie5crckWq0zMcRBJOfE1mJ66L+1+cYBOvPe9jpcmd
         6koqLQCP3GcR4A/j+rdyH+J2hV0f4zNXj3a+K23s6nHBtI9pnUf5UkjBP7yoSDOAmm5q
         9KCuxyvq/UNZKZK3rhaBhfV/WIi/bTBz37X+okY/42Dc8nKK19nBMz2zcQMC+xYu5sQr
         bjTw==
X-Gm-Message-State: AOAM533tFV0Qf8/4o7BZHiFDTROvI5uxsjyfTf5+a8/he9g5jcMfJTeO
        8SEvmdywPEhnENoLzR8LNOtEvUdk7Ns=
X-Google-Smtp-Source: 
 ABdhPJyex4Ay2aY6rGMEXTZN17ynymE//Uuuj1ZS2mXg/Pr5PAprUM1mhKwgDEh8m1iz2l+VSTiNJA==
X-Received: by 2002:a5d:47c2:: with SMTP id o2mr4259473wrc.442.1643310513243;
        Thu, 27 Jan 2022 11:08:33 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id
 u17sm100798wmq.41.2022.01.27.11.08.32
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Thu, 27 Jan 2022 11:08:32 -0800 (PST)
Message-Id: 
 <19c7223e265962eac2f56d82d87c2fd069f04c6e.1643310510.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1127.v2.git.1643310510.gitgitgadget@gmail.com>
References: <pull.1127.git.1643149759.gitgitgadget@gmail.com>
        <pull.1127.v2.git.1643310510.gitgitgadget@gmail.com>
Date: Thu, 27 Jan 2022 19:08:28 +0000
Subject: [PATCH v2 2/3] diff.c: move the diff filter bits definitions up a bit
Fcc: Sent
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Taylor Blau <me@ttaylorr.com>,
 =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason  <avarab@gmail.com>,
 Johannes Schindelin <johannes.schindelin@gmx.de>,
 Johannes Schindelin <johannes.schindelin@gmx.de>
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
From: Johannes Schindelin <johannes.schindelin@gmx.de>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

This prepares for a more careful handling of the `--diff-filter`
options over the next few commits.

This commit is best viewed with `--color-moved`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 diff.c | 74 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/diff.c b/diff.c
index c862771a589..5081052c431 100644
--- a/diff.c
+++ b/diff.c
@@ -4570,6 +4570,43 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
 	prep_parse_options(options);
 }
 
+static const char diff_status_letters[] = {
+	DIFF_STATUS_ADDED,
+	DIFF_STATUS_COPIED,
+	DIFF_STATUS_DELETED,
+	DIFF_STATUS_MODIFIED,
+	DIFF_STATUS_RENAMED,
+	DIFF_STATUS_TYPE_CHANGED,
+	DIFF_STATUS_UNKNOWN,
+	DIFF_STATUS_UNMERGED,
+	DIFF_STATUS_FILTER_AON,
+	DIFF_STATUS_FILTER_BROKEN,
+	'\0',
+};
+
+static unsigned int filter_bit['Z' + 1];
+
+static void prepare_filter_bits(void)
+{
+	int i;
+
+	if (!filter_bit[DIFF_STATUS_ADDED]) {
+		for (i = 0; diff_status_letters[i]; i++)
+			filter_bit[(int) diff_status_letters[i]] = (1 << i);
+	}
+}
+
+static unsigned filter_bit_tst(char status, const struct diff_options *opt)
+{
+	return opt->filter & filter_bit[(int) status];
+}
+
+unsigned diff_filter_bit(char status)
+{
+	prepare_filter_bits();
+	return filter_bit[(int) status];
+}
+
 void diff_setup_done(struct diff_options *options)
 {
 	unsigned check_mask = DIFF_FORMAT_NAME |
@@ -4774,43 +4811,6 @@ static int parse_dirstat_opt(struct diff_options *options, const char *params)
 	return 1;
 }
 
-static const char diff_status_letters[] = {
-	DIFF_STATUS_ADDED,
-	DIFF_STATUS_COPIED,
-	DIFF_STATUS_DELETED,
-	DIFF_STATUS_MODIFIED,
-	DIFF_STATUS_RENAMED,
-	DIFF_STATUS_TYPE_CHANGED,
-	DIFF_STATUS_UNKNOWN,
-	DIFF_STATUS_UNMERGED,
-	DIFF_STATUS_FILTER_AON,
-	DIFF_STATUS_FILTER_BROKEN,
-	'\0',
-};
-
-static unsigned int filter_bit['Z' + 1];
-
-static void prepare_filter_bits(void)
-{
-	int i;
-
-	if (!filter_bit[DIFF_STATUS_ADDED]) {
-		for (i = 0; diff_status_letters[i]; i++)
-			filter_bit[(int) diff_status_letters[i]] = (1 << i);
-	}
-}
-
-static unsigned filter_bit_tst(char status, const struct diff_options *opt)
-{
-	return opt->filter & filter_bit[(int) status];
-}
-
-unsigned diff_filter_bit(char status)
-{
-	prepare_filter_bits();
-	return filter_bit[(int) status];
-}
-
 static int diff_opt_diff_filter(const struct option *option,
 				const char *optarg, int unset)
 {

From patchwork Thu Jan 27 19:08:29 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Johannes Schindelin <johannes.schindelin@gmx.de>
X-Patchwork-Id: 12727202
Return-Path: <git-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 08A04C433EF
	for <git@archiver.kernel.org>; Thu, 27 Jan 2022 19:08:39 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S245436AbiA0TIi (ORCPT <rfc822;git@archiver.kernel.org>);
        Thu, 27 Jan 2022 14:08:38 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59168 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S245457AbiA0TIg (ORCPT <rfc822;git@vger.kernel.org>);
        Thu, 27 Jan 2022 14:08:36 -0500
Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com
 [IPv6:2a00:1450:4864:20::432])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8661BC061714
        for <git@vger.kernel.org>; Thu, 27 Jan 2022 11:08:35 -0800 (PST)
Received: by mail-wr1-x432.google.com with SMTP id s9so6535441wrb.6
        for <git@vger.kernel.org>; Thu, 27 Jan 2022 11:08:35 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20210112;
        h=message-id:in-reply-to:references:from:date:subject:fcc
         :content-transfer-encoding:mime-version:to:cc;
        bh=tA2Eye5aVsGlfk44zjOdGDjWrfUA3v08Gwm7WipygZA=;
        b=GNF8lxEH8+fgXRvsKNY0QrX9Ljv+P8n8XvGXkiEPvV0pXP3handYGRP+e76zWm9pmj
         s24lUSBKibzr40vH7SzX/PjaXFBvPbBdf91YnMo3HNkYUMULnTzOWgVTUXd5YIj6c+1+
         Qr+g5HbdF3DYjxHlJKlTYW9ZQ1xD2bbo0EvecIF1kgXBn9I38RECjZc050V7SuLD9xYZ
         Y45bcB+/g2mqIutNMWFNpGET4x2ZWfxDNrz1HNw7ldTd87Rk74dwNdnZwv+xTL43R6rp
         6xFnqU6ayD2yG8FfQ4bgy00s+WaCv0eJxan6GSdft1w++2mLp2JHjWYUB1ywzHns2XpF
         Pk6g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:message-id:in-reply-to:references:from:date
         :subject:fcc:content-transfer-encoding:mime-version:to:cc;
        bh=tA2Eye5aVsGlfk44zjOdGDjWrfUA3v08Gwm7WipygZA=;
        b=iagppBVSyPcCqdRcYi3Aoppi16UuxLr2aYPWV0lXvcpgMe9CCDeml5F9niWmbt7EHw
         a08SUPOIxoEXDsh2mwvn0IEOPiX5eUxY98MAdm66fRStsS159+8zdGvi3bHxjvAiA3GR
         7gVYtA1be7Xq9bkQEQT7Ac7zlmpWJG8JixHKOYfUo2kexuhMi3VOpOOkurrsHd/mnTTp
         vVSsylobmmvE2y471n0fSxRxBMe6G/naiqs+Rgxasw384rGkVgOzvUxbSXCYocoVMiFT
         gyol/p8lvexDOjspxz1PfGGPPIyVlVJ4cCAbHNd7MM1V+ZeKbU9hiMPUXDj917KBjojw
         4lFA==
X-Gm-Message-State: AOAM5316xRtc6BqH52NnwkoWQzqhqOrPyE1pXoMicRabZSj94RfNXO/p
        qmWVPBBmcY3rWYO/meCl8WpRR2U/D6U=
X-Google-Smtp-Source: 
 ABdhPJwzCy7NDbaA/E9lNOB2JyodoYEsQcIhF5bpVDH2ZL1Qt58Wkr8QRcPnnUVLRU5VcXVIFXXRsQ==
X-Received: by 2002:adf:f80a:: with SMTP id s10mr4042607wrp.440.1643310513984;
        Thu, 27 Jan 2022 11:08:33 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id
 h1sm2757705wrq.82.2022.01.27.11.08.33
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Thu, 27 Jan 2022 11:08:33 -0800 (PST)
Message-Id: 
 <b041d2b7a3bd4433e86438cddbd52857e5f375a6.1643310510.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1127.v2.git.1643310510.gitgitgadget@gmail.com>
References: <pull.1127.git.1643149759.gitgitgadget@gmail.com>
        <pull.1127.v2.git.1643310510.gitgitgadget@gmail.com>
Date: Thu, 27 Jan 2022 19:08:29 +0000
Subject: [PATCH v2 3/3] diff-filter: be more careful when looking for negative
 bits
Fcc: Sent
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Taylor Blau <me@ttaylorr.com>,
 =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason  <avarab@gmail.com>,
 Johannes Schindelin <johannes.schindelin@gmx.de>,
 Johannes Schindelin <johannes.schindelin@gmx.de>
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
From: Johannes Schindelin <johannes.schindelin@gmx.de>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

The `--diff-filter=<bits>` option allows to filter the diff by certain
criteria, for example `R` to only show renamed files. It also supports
negating a filter via a down-cased letter, i.e. `r` to show _everything
but_ renamed files.

However, the code is a bit overzealous when trying to figure out whether
`git diff` should start with all diff-filters turned on because the user
provided a lower-case letter: if the `--diff-filter` argument starts
with an upper-case letter, we must not start with all bits turned on.

Even worse, it is possible to specify the diff filters in multiple,
separate options, e.g. `--diff-filter=AM [...] --diff-filter=m`.

Let's accumulate the include/exclude filters independently, and only
special-case the "only exclude filters were specified" case after
parsing the options altogether.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 diff.c         | 23 +++++++----------------
 diff.h         |  2 +-
 t/t4202-log.sh | 13 +++++++++++++
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/diff.c b/diff.c
index 5081052c431..4ab4299b817 100644
--- a/diff.c
+++ b/diff.c
@@ -4720,6 +4720,12 @@ void diff_setup_done(struct diff_options *options)
 	if (!options->use_color || external_diff())
 		options->color_moved = 0;
 
+	if (options->filter_not) {
+		if (!options->filter)
+			options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON];
+		options->filter &= ~options->filter_not;
+	}
+
 	FREE_AND_NULL(options->parseopts);
 }
 
@@ -4820,21 +4826,6 @@ static int diff_opt_diff_filter(const struct option *option,
 	BUG_ON_OPT_NEG(unset);
 	prepare_filter_bits();
 
-	/*
-	 * If there is a negation e.g. 'd' in the input, and we haven't
-	 * initialized the filter field with another --diff-filter, start
-	 * from full set of bits, except for AON.
-	 */
-	if (!opt->filter) {
-		for (i = 0; (optch = optarg[i]) != '\0'; i++) {
-			if (optch < 'a' || 'z' < optch)
-				continue;
-			opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
-			opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
-			break;
-		}
-	}
-
 	for (i = 0; (optch = optarg[i]) != '\0'; i++) {
 		unsigned int bit;
 		int negate;
@@ -4851,7 +4842,7 @@ static int diff_opt_diff_filter(const struct option *option,
 			return error(_("unknown change class '%c' in --diff-filter=%s"),
 				     optarg[i], optarg);
 		if (negate)
-			opt->filter &= ~bit;
+			opt->filter_not |= bit;
 		else
 			opt->filter |= bit;
 	}
diff --git a/diff.h b/diff.h
index 8ba85c5e605..a70e7c478c1 100644
--- a/diff.h
+++ b/diff.h
@@ -283,7 +283,7 @@ struct diff_options {
 	struct diff_flags flags;
 
 	/* diff-filter bits */
-	unsigned int filter;
+	unsigned int filter, filter_not;
 
 	int use_color;
 
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 50495598619..b25182379ff 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -142,6 +142,19 @@ test_expect_success 'diff-filter=R' '
 
 '
 
+test_expect_success 'multiple --diff-filter bits' '
+
+	git log -M --pretty="format:%s" --diff-filter=R HEAD >expect &&
+	git log -M --pretty="format:%s" --diff-filter=Ra HEAD >actual &&
+	test_cmp expect actual &&
+	git log -M --pretty="format:%s" --diff-filter=aR HEAD >actual &&
+	test_cmp expect actual &&
+	git log -M --pretty="format:%s" \
+		--diff-filter=a --diff-filter=R HEAD >actual &&
+	test_cmp expect actual
+
+'
+
 test_expect_success 'diff-filter=C' '
 
 	git log -C -C --pretty="format:%s" --diff-filter=C HEAD >actual &&