On 2019-08-09 at 13:51:49, Jeff King wrote:
> On Fri, Aug 09, 2019 at 02:43:18PM +0200, SZEDER Gábor wrote:
> > But there is an other subtlety here: when I read the commit message
> > saying "patch that touches a path ending in ".gitattributes"." and saw
> > the new call to strip_path_suffix(), I i
On Fri, Aug 09, 2019 at 02:43:18PM +0200, SZEDER Gábor wrote:
> > I think you could do this with:
> >
> > size_t len;
> > if (strip_suffix(patch->new_name, GITATTRIBUTES_FILE, &len) &&
> > len > 0 && is_dir_sep(patch->new_name[len-1]))
> > flush_attributes = 1;
> >
> > Not su
On Fri, Aug 09, 2019 at 07:36:14AM -0400, Jeff King wrote:
> On Fri, Aug 09, 2019 at 11:25:52AM +, brian m. carlson wrote:
>
> > > > + if (!flush_attributes && patch->new_name) {
> > > > + char *dummy =
> > > > strip_path_suffix(patch->new_n
On 2019-08-09 at 11:36:14, Jeff King wrote:
> I think you could do this with:
>
> size_t len;
> if (strip_suffix(patch->new_name, GITATTRIBUTES_FILE, &len) &&
> len > 0 && is_dir_sep(patch->new_name[len-1]))
> flush_attributes = 1;
>
> Not sure if that is better or worse. It a
On Fri, Aug 09, 2019 at 11:25:52AM +, brian m. carlson wrote:
> > > + if (!flush_attributes && patch->new_name) {
> > > + char *dummy =
> > > strip_path_suffix(patch->new_name, GITATTRIBUTES_FILE);
> >
> > It's a shame that 'strip_path_suffix' doesn't
On 2019-08-09 at 11:14:52, Taylor Blau wrote:
> > diff --git a/apply.c b/apply.c
> > index cde95369bb..b959b88b8e 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 sk
Hi brian,
On Fri, Aug 09, 2019 at 10:02:17AM +, 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 sub
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 attribute
8 matches
Mail list logo
