From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Subject: am-based rebase not applying filters
Date: Thu, 1 Aug 2019 01:52:04 +0000 [thread overview]
Message-ID: <20190801015204.GA12118@genre.crustytoothpaste.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]
Recently, someone[0] pointed out to me that am-based rebases don't apply
smudge and clean filters on the final checkout.
Reproduction:
-----
#!/bin/sh -e
mkdir test-repo
cd test-repo
git init
git config filter.test.clean "sed -e 's/smudged/clean/g'"
git config filter.test.smudge "sed -e 's/clean/smudged/g'"
echo a >a.bin
git add a.bin
git commit -m 'Add a.bin'
echo b >b.bin
git add b.bin
git commit -m 'Add b.bin'
git checkout -b test HEAD^
echo '*.txt filter=test' >.gitattributes
git add .gitattributes
git commit -m 'Add .gitattributes'
echo 'This text is smudged.' >a.txt
git add a.txt
git commit -m 'Add a.txt'
git rebase master
grep 'smudged' a.txt
-----
The correct behavior is to have the script print that the text is
smudged, but with an am-based rebase, the text is clean. If you change
the rebase to use -i or -m, the test succeeds (the filters are applied).
This may also affect things like working-tree encodings or line endings;
I'm not sure.
I'm planning on taking a look at fixing this (unless of course someone
gets to it before me), but I wanted to mention this as in case it rang a
bell for anyone.
I have no reason to think this is version-specific behavior, but I'm
using Git 2.23.0.rc0.142.g4dedae46a2 from Debian experimental, and this
also reproduces on a fairly recent master on macOS.
[0] This was brought to my attention by Erika Ellison.
--
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 868 bytes --]
reply other threads:[~2019-08-01 1:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190801015204.GA12118@genre.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).