Re: [PATCH v3 2/2] apply: reload .gitattributes after patching it

2019-08-15 Thread brian m. carlson
On 2019-08-15 at 22:10:29, Junio C Hamano wrote: > Junio C Hamano writes: > > > "brian m. carlson" 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 c

Re: [PATCH v3 2/2] apply: reload .gitattributes after patching it

2019-08-15 Thread Junio C Hamano
Junio C Hamano writes: > "brian m. carlson" 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 ha

Re: [PATCH v3 2/2] apply: reload .gitattributes after patching it

2019-08-13 Thread brian m. carlson
On 2019-08-13 at 22:37:56, Junio C Hamano wrote: > "brian m. carlson" writes: > > > +test_expect_success 'rebase --am and .gitattributes' ' > > + test_create_repo attributes && > > + ( > > + cd attributes && > > + test_commit init && > > + test_config filter.test

Re: [PATCH v3 2/2] apply: reload .gitattributes after patching it

2019-08-13 Thread Junio C Hamano
"brian m. carlson" writes: > +test_expect_success 'rebase --am and .gitattributes' ' > + test_create_repo attributes && > + ( > + cd attributes && > + test_commit init && > + test_config filter.test.clean "sed -e > '\''s/smudged/clean/g'\''" && > +

Re: [PATCH v3 2/2] apply: reload .gitattributes after patching it

2019-08-13 Thread Junio C Hamano
"brian m. carlson" 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 w