git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Stefan Beller <sbeller@google.com>
Date
Jul 18, 2018, 23:41 UTC
Message-ID
<CAGZ79kY15nPGwtOF=i09gQpykcxT4ZRzakuBr=aD94wRXtKOAQ@mail.gmail.com>
In-Reply-To
<xmqqtvowi4l3.fsf@gitster-ct.c.googlers.com>
On Wed, Jul 18, 2018 at 3:04 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 10 quoted lines
> 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.
>
Show 12 quoted lines
> * 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
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 14 in “What's cooking in git.git (Jul 2018, #02; Wed, 18)”
  1. Junio C HamanoJul 18, 2018
  2. Stefan BellerJul 18, 2018
  3. Junio C HamanoJul 19, 2018
  4. Оля ТележнаяJul 19, 2018
  5. Eric SunshineJul 19, 2018
  6. Junio C HamanoJul 19, 2018
  7. Elijah NewrenJul 19, 2018
  8. ds/multi-pack-index (was Re: What's cooking in git.git (Jul 2018, #02; Wed, 18))Derrick Stolee, Jul 20, 2018
  9. Junio C HamanoJul 20, 2018
  10. Derrick StoleeJul 20, 2018
  11. ag/rebase-i-in-c, was Re: What's cooking in git.git (Jul 2018, #02; Wed, 18)Alban Gruin, Jul 20, 2018
  12. Jonathan TanJul 23, 2018
  13. Junio C HamanoJul 24, 2018
  14. Brandon WilliamsJul 24, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.