From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Taylor Blau" <me@ttaylorr.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: [PATCH v3 0/3] Fix two --diff-filter bugs
Date: Fri, 28 Jan 2022 12:02:47 +0000 [thread overview]
Message-ID: <pull.1127.v3.git.1643371370.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1127.v2.git.1643310510.gitgitgadget@gmail.com>
A colleague noticed that git diff --diff-filter=Dr behaved in an unexpected
way. The expectation was that the command shows only deleted files, but not
renamed ones.
Turns out that Git's code is incorrect and turns on all diff-filter flags
because the argument contains a lower-case letter. But since it starts with
an upper-case letter, we should actually not turn all those flags on.
While working on the fix, I realized that the documentation of the
--diff-filter flag was not updated when intent-to-add files were no longer
shown as modified by git diff, but as added.
Changes since v2:
* Augmented the commit message to explain why we do not need to be careful
about setting only the used bits of options->filter.
Changes since v1:
* Now even the case of multiple --diff-filter options is handled.
Johannes Schindelin (3):
docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
diff.c: move the diff filter bits definitions up a bit
diff-filter: be more careful when looking for negative bits
Documentation/diff-options.txt | 7 +--
diff.c | 97 +++++++++++++++-------------------
diff.h | 2 +-
t/t4202-log.sh | 13 +++++
4 files changed, 60 insertions(+), 59 deletions(-)
base-commit: 89bece5c8c96f0b962cfc89e63f82d603fd60bed
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1127%2Fdscho%2Fdiff-filter-buglets-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1127/dscho/diff-filter-buglets-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1127
Range-diff vs v2:
1: 704bb2ba18e = 1: 704bb2ba18e docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
2: 19c7223e265 = 2: 19c7223e265 diff.c: move the diff filter bits definitions up a bit
3: b041d2b7a3b ! 3: f1f027ad61b diff-filter: be more careful when looking for negative bits
@@ Commit message
special-case the "only exclude filters were specified" case after
parsing the options altogether.
+ Note: The code replaced by this commit took pains to avoid setting any
+ unused bits of `options->filter`. That was unnecessary, though, as all
+ accesses happen via the `filter_bit_tst()` function using specific bits,
+ and setting the unused bits has no effect. Therefore, we can simplify
+ the code by using `~0` (or in this instance, `~<unwanted-bit>`).
+
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
## diff.c ##
--
gitgitgadget
next prev parent reply other threads:[~2022-01-28 12:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 22:29 [PATCH 0/2] Fix two --diff-filter bugs Johannes Schindelin via GitGitGadget
2022-01-25 22:29 ` [PATCH 1/2] docs(diff): lose incorrect claim about `diff-files --diff-filter=A` Johannes Schindelin via GitGitGadget
2022-01-26 7:03 ` Junio C Hamano
2022-01-25 22:29 ` [PATCH 2/2] diff-filter: be more careful when looking for negative bits Johannes Schindelin via GitGitGadget
2022-01-25 23:21 ` Taylor Blau
2022-01-28 11:52 ` Johannes Schindelin
2022-01-26 7:23 ` Junio C Hamano
2022-01-26 22:55 ` Taylor Blau
2022-01-26 23:36 ` Junio C Hamano
2022-01-28 11:54 ` Johannes Schindelin
2022-01-26 17:57 ` Ævar Arnfjörð Bjarmason
2022-01-27 19:08 ` [PATCH v2 0/3] Fix two --diff-filter bugs Johannes Schindelin via GitGitGadget
2022-01-27 19:08 ` [PATCH v2 1/3] docs(diff): lose incorrect claim about `diff-files --diff-filter=A` Johannes Schindelin via GitGitGadget
2022-01-27 19:08 ` [PATCH v2 2/3] diff.c: move the diff filter bits definitions up a bit Johannes Schindelin via GitGitGadget
2022-01-27 19:08 ` [PATCH v2 3/3] diff-filter: be more careful when looking for negative bits Johannes Schindelin via GitGitGadget
2022-01-28 1:16 ` Junio C Hamano
2022-01-28 12:01 ` Johannes Schindelin
2022-01-28 12:02 ` Johannes Schindelin via GitGitGadget [this message]
2022-01-28 12:02 ` [PATCH v3 1/3] docs(diff): lose incorrect claim about `diff-files --diff-filter=A` Johannes Schindelin via GitGitGadget
2022-01-28 12:02 ` [PATCH v3 2/3] diff.c: move the diff filter bits definitions up a bit Johannes Schindelin via GitGitGadget
2022-01-28 12:02 ` [PATCH v3 3/3] diff-filter: be more careful when looking for negative bits Johannes Schindelin via GitGitGadget
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1127.v3.git.1643371370.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=me@ttaylorr.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.
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 NNTP newsgroup(s).