Re: [PATCHv3 0/5] Fix --recurse-submodules for submodule worktree changes

2018-01-03 Thread Stefan Beller
On Wed, Jan 3, 2018 at 12:49 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Thanks Junio for review of this series! >> The only change in this version of the series is >> >> --- a/unpack-trees.c >> +++ b/unpack-trees.c >> @@ -2140,7 +2140,7 @@ int oneway_merge(const struct cache_entry * c

Re: [PATCHv3 0/5] Fix --recurse-submodules for submodule worktree changes

2018-01-03 Thread Junio C Hamano
Stefan Beller writes: > Thanks Junio for review of this series! > The only change in this version of the series is > > --- a/unpack-trees.c > +++ b/unpack-trees.c > @@ -2140,7 +2140,7 @@ int oneway_merge(const struct cache_entry * const *src, > update |= CE_UPDATE;

[PATCHv3 0/5] Fix --recurse-submodules for submodule worktree changes

2018-01-02 Thread Stefan Beller
Thanks Junio for review of this series! The only change in this version of the series is --- a/unpack-trees.c +++ b/unpack-trees.c @@ -2140,7 +2140,7 @@ int oneway_merge(const struct cache_entry * const *src, update |= CE_UPDATE; } if