From: Junio C Hamano <gitster@pobox.com> To: "brian m. carlson" <sandals@crustytoothpaste.net> Cc: git@vger.kernel.org, "SZEDER Gábor" <szeder.dev@gmail.com>, "Taylor Blau" <me@ttaylorr.com>, "Jeff King" <peff@peff.net> Subject: Re: [PATCH v3 2/2] apply: reload .gitattributes after patching it Date: Thu, 15 Aug 2019 15:10:29 -0700 Message-ID: <xmqqftm22i7e.fsf@gitster-ct.c.googlers.com> (raw) In-Reply-To: <xmqq7e7h7xap.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Tue, 13 Aug 2019 11:08:46 -0700") Junio C Hamano <gitster@pobox.com> writes: > "brian m. carlson" <sandals@crustytoothpaste.net> writes: > >> When applying multiple patches with git am, or when rebasing using the >> am backend, it's possible that one of our patches has updated a >> gitattributes file. Currently, we cache this information, so if a >> file in a subsequent patch has attributes applied, the file will be >> written out with the attributes in place as of the time we started the >> rebase or am operation, not with the attributes applied by the previous >> patch. This problem does not occur when using the -m or -i flags to >> rebase. > ... > "rebase -m" and "rebase -i" are not repeated run_command() calls > that invoke "git cherry-pick" or "git merge" these days, either, so > I am somewhat curious how they avoid fallilng into the same trap. > > Thanks for the fix. Will queue. Actually there still is one more thing I wasn't clear about the change. > To ensure we write the correct data into the working tree, expire the > cache after each patch that touches a path ending in ".gitattributes". > ... > + if (!flush_attributes && patch->new_name && > + ends_with_path_components(patch->new_name, GITATTRIBUTES_FILE)) > + flush_attributes = 1; When an attribute file is removed by a patch, we should forget what we read earlier from the file before it got removed. Would such a case, where patch->new_name would be NULL, be handled correctly? The call to ends_with_path_components() is almost no cost, and I would suspect that this call is easier to reason about without the "!flush_attributes &&" in the conditional part, by the way. Thanks.
next prev parent reply other threads:[~2019-08-15 22:10 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-09 10:02 [PATCH] " brian m. carlson 2019-08-09 11:14 ` Taylor Blau 2019-08-09 11:25 ` brian m. carlson 2019-08-09 11:36 ` Jeff King 2019-08-09 11:47 ` brian m. carlson 2019-08-09 12:43 ` SZEDER Gábor 2019-08-09 13:51 ` Jeff King 2019-08-09 22:08 ` brian m. carlson 2019-08-11 17:47 ` [PATCH v2 0/2] Honor .gitattributes with rebase --am brian m. carlson 2019-08-11 17:47 ` [PATCH v2 1/2] path: add a function to check for path suffix brian m. carlson 2019-08-12 0:32 ` Junio C Hamano 2019-08-12 1:10 ` brian m. carlson 2019-08-12 4:36 ` SZEDER Gábor 2019-08-12 16:49 ` Junio C Hamano 2019-08-12 22:40 ` brian m. carlson 2019-08-13 1:13 ` Jeff King 2019-08-13 16:40 ` Junio C Hamano 2019-08-13 6:36 ` SZEDER Gábor 2019-08-13 16:42 ` Junio C Hamano 2019-08-11 17:47 ` [PATCH v2 2/2] apply: reload .gitattributes after patching it brian m. carlson 2019-08-13 2:43 ` [PATCH v3 0/2] Honor .gitattributes with rebase --am brian m. carlson 2019-08-13 2:43 ` [PATCH v3 1/2] path: add a function to check for path suffix brian m. carlson 2019-08-13 2:43 ` [PATCH v3 2/2] apply: reload .gitattributes after patching it brian m. carlson 2019-08-13 18:08 ` Junio C Hamano 2019-08-15 22:10 ` Junio C Hamano [this message] 2019-08-16 0:22 ` brian m. carlson 2019-08-13 22:37 ` Junio C Hamano 2019-08-13 22:48 ` brian m. carlson 2019-08-18 18:44 ` [PATCH v4 0/2] Honor .gitattributes with rebase --am brian m. carlson 2019-08-18 18:44 ` [PATCH v4 1/2] path: add a function to check for path suffix brian m. carlson 2019-08-18 18:44 ` [PATCH v4 2/2] apply: reload .gitattributes after patching it brian m. carlson 2019-08-19 9:41 ` Phillip Wood 2019-08-19 9:55 ` Phillip Wood 2019-08-20 3:05 ` brian m. carlson 2019-08-20 8:56 ` Phillip Wood 2019-08-20 2:45 ` brian m. carlson 2019-08-20 8:52 ` Phillip Wood 2019-08-20 18:24 ` Junio C Hamano 2019-08-20 18:32 ` Phillip Wood 2019-08-26 15:09 ` Phillip Wood 2019-08-26 16:41 ` Junio C Hamano
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=xmqqftm22i7e.fsf@gitster-ct.c.googlers.com \ --to=gitster@pobox.com \ --cc=git@vger.kernel.org \ --cc=me@ttaylorr.com \ --cc=peff@peff.net \ --cc=sandals@crustytoothpaste.net \ --cc=szeder.dev@gmail.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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git