From: Phillip Wood <phillip.wood123@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>, git@vger.kernel.org
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Taylor Blau" <me@ttaylorr.com>, "Jeff King" <peff@peff.net>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH v4 2/2] apply: reload .gitattributes after patching it
Date: Mon, 19 Aug 2019 10:41:42 +0100 [thread overview]
Message-ID: <9b940950-666a-0c4c-58c0-1e61ac9e654c@gmail.com> (raw)
In-Reply-To: <20190818184403.861907-3-sandals@crustytoothpaste.net>
Hi Brian
On 18/08/2019 19:44, brian m. carlson wrote:
> 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.
Do you know why -m and -i aren't affected?
> To ensure we write the correct data into the working tree, expire the
> cache after each patch that touches a path ending in ".gitattributes".
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> apply.c | 7 +++++++
> convert.c | 9 ++++++++-
> convert.h | 6 ++++++
> t/t3400-rebase.sh | 36 ++++++++++++++++++++++++++++++++++++
> 4 files changed, 57 insertions(+), 1 deletion(-)
>
> diff --git a/apply.c b/apply.c
> index cde95369bb..d57bc635e4 100644
> --- a/apply.c
> +++ b/apply.c
> @@ -4643,6 +4643,7 @@ static int apply_patch(struct apply_state *state,
> struct patch *list = NULL, **listp = &list;
> int skipped_patch = 0;
> int res = 0;
> + int flush_attributes = 0;
>
> state->patch_input_file = filename;
> if (read_patch_file(&buf, fd) < 0)
> @@ -4670,6 +4671,10 @@ static int apply_patch(struct apply_state *state,
> patch_stats(state, patch);
> *listp = patch;
> listp = &patch->next;
> +
> + if ((patch->new_name && ends_with_path_components(patch->new_name, GITATTRIBUTES_FILE)) ||
> + (patch->old_name && ends_with_path_components(patch->old_name, GITATTRIBUTES_FILE)))
> + flush_attributes = 1;
style nit - these lines are very long compared to 80 characters
> }
> else {
> if (state->apply_verbosity > verbosity_normal)
> @@ -4746,6 +4751,8 @@ static int apply_patch(struct apply_state *state,
> if (state->summary && state->apply_verbosity > verbosity_silent)
> summary_patch_list(list);
>
> + if (flush_attributes)
> + reset_parsed_attributes();
> end:
> free_patch_list(list);
> strbuf_release(&buf);
> diff --git a/convert.c b/convert.c
> index 94ff837649..030e9b81b9 100644
> --- a/convert.c
> +++ b/convert.c
> @@ -1293,10 +1293,11 @@ struct conv_attrs {
> const char *working_tree_encoding; /* Supported encoding or default encoding if NULL */
> };
>
> +static struct attr_check *check;
I was concerned about the impact adding a file global if we ever want to
multi-thread this for submodules, but looking through the file there are
a couple of others already so this isn't creating a new problem.
Best Wishes
Phillip
> +
> static void convert_attrs(const struct index_state *istate,
> struct conv_attrs *ca, const char *path)
> {
> - static struct attr_check *check;
> struct attr_check_item *ccheck = NULL;
>
> if (!check) {
> @@ -1339,6 +1340,12 @@ static void convert_attrs(const struct index_state *istate,
> ca->crlf_action = CRLF_AUTO_INPUT;
> }
>
> +void reset_parsed_attributes(void)
> +{
> + attr_check_free(check);
> + check = NULL;
> +}
> +
> int would_convert_to_git_filter_fd(const struct index_state *istate, const char *path)
> {
> struct conv_attrs ca;
> diff --git a/convert.h b/convert.h
> index 831559f10d..3710969d43 100644
> --- a/convert.h
> +++ b/convert.h
> @@ -94,6 +94,12 @@ void convert_to_git_filter_fd(const struct index_state *istate,
> int would_convert_to_git_filter_fd(const struct index_state *istate,
> const char *path);
>
> +/*
> + * Reset the internal list of attributes used by convert_to_git and
> + * convert_to_working_tree.
> + */
> +void reset_parsed_attributes(void);
> +
> /*****************************************************************
> *
> * Streaming conversion support
> diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
> index 80b23fd326..23469cc789 100755
> --- a/t/t3400-rebase.sh
> +++ b/t/t3400-rebase.sh
> @@ -301,6 +301,42 @@ test_expect_success 'rebase --am and --show-current-patch' '
> )
> '
>
> +test_expect_success 'rebase --am and .gitattributes' '
> + test_create_repo attributes &&
> + (
> + cd attributes &&
> + test_commit init &&
> + git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
> + git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&
> +
> + test_commit second &&
> + git checkout -b test HEAD^ &&
> +
> + echo "*.txt filter=test" >.gitattributes &&
> + git add .gitattributes &&
> + test_commit third &&
> +
> + echo "This text is smudged." >a.txt &&
> + git add a.txt &&
> + test_commit fourth &&
> +
> + git checkout -b removal HEAD^ &&
> + git rm .gitattributes &&
> + git add -u &&
> + test_commit fifth &&
> + git cherry-pick test &&
> +
> + git checkout test &&
> + git rebase master &&
> + grep "smudged" a.txt &&
> +
> + git checkout removal &&
> + git reset --hard &&
> + git rebase master &&
> + grep "clean" a.txt
> + )
> +'
> +
> test_expect_success 'rebase--merge.sh and --show-current-patch' '
> test_create_repo conflict-merge &&
> (
>
next prev parent reply other threads:[~2019-08-19 9:41 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 10:02 [PATCH] apply: reload .gitattributes after patching it 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
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 [this message]
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=9b940950-666a-0c4c-58c0-1e61ac9e654c@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--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
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).