Re: What's cooking in git.git (Jul 2018, #02; Wed, 18)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Jul 18, 2018 at 3:04 PM Junio C Hamano <gitster@xxxxxxxxx> wrote:

> Many topics have moved to 'master' and 'next' from 'next' to 'pu'
> respectively.  As I needed to re-resolve semantic merge conflicts
> while reordering some topics (i.e. some that were merged earlier in
> 'pu' are left in 'pu' while another topic that had interactions with
> them and required evil merge to resolve semantic conflicts
> leapfrogged to 'next'---the semantic conflict resolution then need
> to happen at a different merge than done earlier in 'pu' while
> rebuilding today's integration), I didn't have enough time to spend
> on new topics posted to the list in the past few days.
>

> * sb/submodule-update-in-c (2018-07-17) 6 commits
>  - submodule--helper: introduce new update-module-mode helper
>  - builtin/submodule--helper: factor out method to update a single submodule
>  - builtin/submodule--helper: store update_clone information in a struct
>  - builtin/submodule--helper: factor out submodule updating
>  - git-submodule.sh: rename unused variables
>  - git-submodule.sh: align error reporting for update mode to use path
>
>  "git submodule update" is getting rewritten piece-by-piece into C.
>
>  It seems to pass its own self-tests standalone, but seems to break
>  horribly when merged to 'pu'.

It actually breaks combined with sb/submodule-core-worktree  :-(
as that introduces another user of $name in git-submodule.sh
which we eliminate in this series.

I'll build on top of that and send a fixed version.

Sorry about being confused and breaking so much lately,

Stefan



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux