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

Re: [PATCH v5 00/12] rebase: update branches in multi-part topic

From
Elijah Newren <newren@gmail.com>
Date
Jul 21, 2022, 04:35 UTC
Message-ID
<CABPp-BGKzcVatwoLhzXiJ3jkKXgWne+=5xNj+VmNO=pL5Kr1Og@mail.gmail.com>
In-Reply-To
<pull.1247.v5.git.1658255624.gitgitgadget@gmail.com>

On Tue, Jul 19, 2022 at 11:33 AM Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 87 quoted lines
>
> This series is based on ds/branch-checked-out.
>
> This is a feature I've wanted for quite a while. When working on the sparse
> index topic, I created a long RFC that actually broke into three topics for
> full review upstream. These topics were sequential, so any feedback on an
> earlier one required updates to the later ones. I would work on the full
> feature and use interactive rebase to update the full list of commits.
> However, I would need to update the branches pointing to those sub-topics.
>
> This series adds a new --update-refs option to 'git rebase' (along with a
> rebase.updateRefs config option) that adds 'update-ref' commands into the
> TODO list. This is powered by the commit decoration machinery.
>
> As an example, here is my in-progress bundle URI RFC split into subtopics as
> they appear during the TODO list of a git rebase -i --update-refs:
>
> pick 2d966282ff3 docs: document bundle URI standard
> pick 31396e9171a remote-curl: add 'get' capability
> pick 54c6ab70f67 bundle-uri: create basic file-copy logic
> pick 96cb2e35af1 bundle-uri: add support for http(s):// and file://
> pick 6adaf842684 fetch: add --bundle-uri option
> pick 6c5840ed77e fetch: add 'refs/bundle/' to log.excludeDecoration
> update-ref refs/heads/bundle-redo/fetch
>
> pick 1e3f6546632 clone: add --bundle-uri option
> pick 9e4a6fe9b68 clone: --bundle-uri cannot be combined with --depth
> update-ref refs/heads/bundle-redo/clone
>
> pick 5451cb6599c bundle-uri: create bundle_list struct and helpers
> pick 3029c3aca15 bundle-uri: create base key-value pair parsing
> pick a8b2de79ce8 bundle-uri: create "key=value" line parsing
> pick 92625a47673 bundle-uri: unit test "key=value" parsing
> pick a8616af4dc2 bundle-uri: limit recursion depth for bundle lists
> pick 9d6809a8d53 bundle-uri: parse bundle list in config format
> pick 287a732b54c bundle-uri: fetch a list of bundles
> update-ref refs/heads/bundle-redo/list
>
> pick b09f8226185 protocol v2: add server-side "bundle-uri" skeleton
> pick 520204dcd1c bundle-uri client: add minimal NOOP client
> pick 62e8b457b48 bundle-uri client: add "git ls-remote-bundle-uri"
> pick 00eae925043 bundle-uri: serve URI advertisement from bundle.* config
> pick 4277440a250 bundle-uri client: add boolean transfer.bundleURI setting
> pick caf4599a81d bundle-uri: allow relative URLs in bundle lists
> pick df255000b7e bundle-uri: download bundles from an advertised list
> pick d71beabf199 clone: unbundle the advertised bundles
> pick c9578391976 t5601: basic bundle URI tests
> # Ref refs/heads/bundle-redo/rfc-3 checked out at '/home/stolee/_git/git-bundles'
>
> update-ref refs/heads/bundle-redo/advertise
>
>
> Here is an outline of the series:
>
>  * Patch 1 updates some tests for branch_checked_out() to use 'git bisect'
>    and 'git rebase' as black-boxes instead of manually editing files inside
>    $GIT_DIR. (Thanks, Junio!)
>  * Patch 2 updates some tests for branch_checked_out() for the 'apply'
>    backend.
>  * Patch 3 updates branch_checked_out() to parse the
>    rebase-merge/update-refs file to block concurrent ref updates and
>    checkouts on branches selected by --update-refs.
>  * Patch 4 updates the todo list documentation to remove some unnecessary
>    dots in the 'merge' command. This makes it consistent with the 'fixup'
>    command before we document the 'update-ref' command.
>  * Patch 5 updates the definition of todo_command_info to use enum values as
>    array indices.
>  * Patches 6-8 implement the --update-refs logic itself.
>  * Patch 9 specifically updates the update-refs file every time the user
>    edits the todo-list (Thanks Phillip!)
>  * Patch 10 adds the rebase.updateRefs config option similar to
>    rebase.autoSquash.
>  * Patch 11 ignores the HEAD ref when creating the todo list instead of
>    making a comment (Thanks Elijah!)
>  * Patch 12 adds messaging to the end of the rebase stating which refs were
>    updated (Thanks Elijah!)
>
> During review, we have identified some areas that would be good for
> #leftoverbits:
>
>  * Warn the user when they add an 'update-ref ' command but is checked out
>    in another worktree.
>  * The checks in patch 9 are quadratic. They could be sped up using
>    hashtables.
>  * Consider whether we should include an 'update-ref ' command for the HEAD
>    ref, so that all refs are updated in the same way. This might help
>    confused users.

Not necessarily so they are updated in the same way; the behind the scenes mechanism could perhaps still be different. Just so that if the user looks for the "list of things being updated" they don't get surprised that HEAD is missing.

Show 6 quoted lines
>  * The error message for failed ref updates could include information on the
>    commit IDs that would have been used. This can help the user fix the
>    situation by updating the refs manually.
>  * Modify the --update-refs option from a boolean to an
>    optionally-string-parameter that specifies refspecs for the 'update-ref'
>    commands.
refspecs?  Is that the term you really mean here?
Show 12 quoted lines
> Updates in v5
> =============
>
>  * Rename 'wt_dir' to 'wt_git_dir' for clarity.
>  * The documented behavior around 'fixup!' and 'squash!' commits was
>    incorrect, so update the commit message, documentation, and test to
>    demonstrate the actual behavior.
>  * Use CALLOC_ARRAY() to be more idiomatic.
>  * Be much more careful about propagating errors.
>  * Commit message typo: "We an" to "We can"
>  * Remove unnecessary null OID check when writing refs, since those would
>    already be removed by a previous step.

Thanks, I've read over the range-diff and these changes look good to me. One thing I'm curious about (sorry to bring this up so late): "pick" commands come with the old commit hash. Perhaps the update-ref commands should too? (e.g. "update-ref refs/heads/topic from <OLDHASH>")

Previous: Derrick Stolee via GitGitGadgetNext: Derrick Stolee
Message 140 of 144 in “rebase: update branches in multi-part topic”
  1. 0/4 rebase: update branches in multi-part topicDerrick Stolee via GitGitGadget, Jun 3, 2022
  2. 2/4 branch: add branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 3, 2022
  3. Junio C HamanoJun 3, 2022
  4. 1/4 log-tree: create for_each_decoration()Derrick Stolee via GitGitGadget, Jun 3, 2022
  5. Junio C HamanoJun 3, 2022
  6. Derrick StoleeJun 3, 2022
  7. Junio C HamanoJun 3, 2022
  8. 3/4 rebase: add --update-refs optionDerrick Stolee via GitGitGadget, Jun 3, 2022
  9. Phillip WoodJun 7, 2022
  10. 4/4 rebase: add rebase.updateRefs config optionDerrick Stolee via GitGitGadget, Jun 3, 2022
  11. Junio C HamanoJun 3, 2022
  12. Taylor BlauJun 3, 2022
  13. Junio C HamanoJun 3, 2022
  14. Jeff HostetlerJun 3, 2022
  15. Taylor BlauJun 3, 2022
  16. Junio C HamanoJun 3, 2022
  17. Phillip WoodJun 4, 2022
  18. Derrick StoleeJun 6, 2022
  19. Phillip WoodJun 7, 2022
  20. Derrick StoleeJun 7, 2022
  21. Junio C HamanoJun 8, 2022
  22. Junio C HamanoJun 6, 2022
  23. Elijah NewrenJun 7, 2022
  24. 0/7 rebase: update branches in multi-part topicDerrick Stolee via GitGitGadget, Jun 7, 2022
  25. 1/7 log-tree: create for_each_decoration()Derrick Stolee via GitGitGadget, Jun 7, 2022
  26. 3/7 sequencer: define array with enum valuesDerrick Stolee via GitGitGadget, Jun 7, 2022
  27. Junio C HamanoJun 7, 2022
  28. 2/7 branch: add branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 7, 2022
  29. Junio C HamanoJun 7, 2022
  30. Derrick StoleeJun 8, 2022
  31. Derrick StoleeJun 8, 2022
  32. Junio C HamanoJun 8, 2022
  33. 4/7 sequencer: add update-refs commandDerrick Stolee via GitGitGadget, Jun 7, 2022
  34. 6/7 sequencer: implement 'update-refs' commandDerrick Stolee via GitGitGadget, Jun 7, 2022
  35. Junio C HamanoJun 7, 2022
  36. 5/7 rebase: add --update-refs optionDerrick Stolee via GitGitGadget, Jun 7, 2022
  37. 7/7 rebase: add rebase.updateRefs config optionDerrick Stolee via GitGitGadget, Jun 7, 2022
  38. Phillip WoodJun 8, 2022
  39. Derrick StoleeJun 8, 2022
  40. Phillip WoodJun 9, 2022
  41. 0/8 rebase: update branches in multi-part topicDerrick Stolee via GitGitGadget, Jun 28, 2022
  42. 1/8 t2407: test branches currently using apply backendDerrick Stolee via GitGitGadget, Jun 28, 2022
  43. Junio C HamanoJun 28, 2022
  44. Derrick StoleeJun 29, 2022
  45. Junio C HamanoJun 30, 2022
  46. Derrick StoleeJun 30, 2022
  47. 8/8 rebase: add rebase.updateRefs config optionDerrick Stolee via GitGitGadget, Jun 28, 2022
  48. 6/8 rebase: add --update-refs optionDerrick Stolee via GitGitGadget, Jun 28, 2022
  49. Junio C HamanoJun 28, 2022
  50. Derrick StoleeJun 29, 2022
  51. Phillip WoodJul 1, 2022
  52. Elijah NewrenJul 1, 2022
  53. Derrick StoleeJul 4, 2022
  54. Elijah NewrenJul 4, 2022
  55. Derrick StoleeJul 5, 2022
  56. Elijah NewrenJul 8, 2022
  57. 7/8 rebase: update refs from 'update-ref' commandsDerrick Stolee via GitGitGadget, Jun 28, 2022
  58. Junio C HamanoJun 28, 2022
  59. Derrick StoleeJun 29, 2022
  60. Junio C HamanoJun 30, 2022
  61. Derrick StoleeJun 29, 2022
  62. Phillip WoodJul 1, 2022
  63. Junio C HamanoJul 1, 2022
  64. Elijah NewrenJul 1, 2022
  65. Derrick StoleeJul 4, 2022
  66. 5/8 sequencer: add update-ref commandDerrick Stolee via GitGitGadget, Jun 28, 2022
  67. Phillip WoodJun 30, 2022
  68. 4/8 sequencer: define array with enum valuesDerrick Stolee via GitGitGadget, Jun 28, 2022
  69. Junio C HamanoJun 28, 2022
  70. 2/8 branch: consider refs under 'update-refs'Derrick Stolee via GitGitGadget, Jun 28, 2022
  71. Junio C HamanoJun 28, 2022
  72. Derrick StoleeJun 29, 2022
  73. Phillip WoodJun 30, 2022
  74. Junio C HamanoJun 30, 2022
  75. Junio C HamanoJun 30, 2022
  76. Phillip WoodJun 30, 2022
  77. Derrick StoleeJun 30, 2022
  78. Phillip WoodJul 1, 2022
  79. 3/8 rebase-interactive: update 'merge' descriptionDerrick Stolee via GitGitGadget, Jun 28, 2022
  80. Junio C HamanoJun 28, 2022
  81. Derrick StoleeJun 29, 2022
  82. Junio C HamanoJun 30, 2022
  83. Phillip WoodJun 30, 2022
  84. Junio C HamanoJun 28, 2022
  85. Phillip WoodJul 1, 2022
  86. 00/12 rebase: update branches in multi-part topicDerrick Stolee via GitGitGadget, Jul 12, 2022
  87. 01/12 t2407: test bisect and rebase as black-boxesDerrick Stolee via GitGitGadget, Jul 12, 2022
  88. 02/12 t2407: test branches currently using apply backendDerrick Stolee via GitGitGadget, Jul 12, 2022
  89. 03/12 branch: consider refs under 'update-refs'Derrick Stolee via GitGitGadget, Jul 12, 2022
  90. Phillip WoodJul 15, 2022
  91. 05/12 sequencer: define array with enum valuesDerrick Stolee via GitGitGadget, Jul 12, 2022
  92. 04/12 rebase-interactive: update 'merge' descriptionDerrick Stolee via GitGitGadget, Jul 12, 2022
  93. 06/12 sequencer: add update-ref commandDerrick Stolee via GitGitGadget, Jul 12, 2022
  94. 07/12 rebase: add --update-refs optionDerrick Stolee via GitGitGadget, Jul 12, 2022
  95. Elijah NewrenJul 16, 2022
  96. Derrick StoleeJul 19, 2022
  97. SZEDER GáborJul 18, 2022
  98. Derrick StoleeJul 18, 2022
  99. Junio C HamanoJul 18, 2022
  100. Derrick StoleeJul 19, 2022
  101. Junio C HamanoJul 19, 2022
  102. Derrick StoleeJul 19, 2022
  103. 08/12 rebase: update refs from 'update-ref' commandsDerrick Stolee via GitGitGadget, Jul 12, 2022
  104. Phillip WoodJul 15, 2022
  105. Derrick StoleeJul 19, 2022
  106. 09/12 sequencer: rewrite update-refs as user edits todo listDerrick Stolee via GitGitGadget, Jul 12, 2022
  107. Phillip WoodJul 15, 2022
  108. Derrick StoleeJul 15, 2022
  109. Phillip WoodJul 18, 2022
  110. Elijah NewrenJul 16, 2022
  111. 11/12 sequencer: ignore HEAD ref under --update-refsDerrick Stolee via GitGitGadget, Jul 12, 2022
  112. 10/12 rebase: add rebase.updateRefs config optionDerrick Stolee via GitGitGadget, Jul 12, 2022
  113. 12/12 sequencer: notify user of --update-refs activityDerrick Stolee via GitGitGadget, Jul 12, 2022
  114. Phillip WoodJul 15, 2022
  115. Derrick StoleeJul 15, 2022
  116. Elijah NewrenJul 16, 2022
  117. Elijah NewrenJul 16, 2022
  118. Derrick StoleeJul 19, 2022
  119. Junio C HamanoJul 12, 2022
  120. Derrick StoleeJul 14, 2022
  121. Junio C HamanoJul 14, 2022
  122. Elijah NewrenJul 16, 2022
  123. Elijah NewrenJul 16, 2022
  124. Phillip WoodJul 15, 2022
  125. 00/12 rebase: update branches in multi-part topicDerrick Stolee via GitGitGadget, Jul 19, 2022
  126. 01/12 t2407: test bisect and rebase as black-boxesDerrick Stolee via GitGitGadget, Jul 19, 2022
  127. 02/12 t2407: test branches currently using apply backendDerrick Stolee via GitGitGadget, Jul 19, 2022
  128. 03/12 branch: consider refs under 'update-refs'Derrick Stolee via GitGitGadget, Jul 19, 2022
  129. 04/12 rebase-interactive: update 'merge' descriptionDerrick Stolee via GitGitGadget, Jul 19, 2022
  130. 05/12 sequencer: define array with enum valuesDerrick Stolee via GitGitGadget, Jul 19, 2022
  131. 06/12 sequencer: add update-ref commandDerrick Stolee via GitGitGadget, Jul 19, 2022
  132. 07/12 rebase: add --update-refs optionDerrick Stolee via GitGitGadget, Jul 19, 2022
  133. 08/12 rebase: update refs from 'update-ref' commandsDerrick Stolee via GitGitGadget, Jul 19, 2022
  134. Phillip WoodJul 21, 2022
  135. 09/12 sequencer: rewrite update-refs as user edits todo listDerrick Stolee via GitGitGadget, Jul 19, 2022
  136. Phillip WoodJul 21, 2022
  137. 10/12 rebase: add rebase.updateRefs config optionDerrick Stolee via GitGitGadget, Jul 19, 2022
  138. 12/12 sequencer: notify user of --update-refs activityDerrick Stolee via GitGitGadget, Jul 19, 2022
  139. 11/12 sequencer: ignore HEAD ref under --update-refsDerrick Stolee via GitGitGadget, Jul 19, 2022
  140. Elijah NewrenJul 21, 2022
  141. Derrick StoleeJul 21, 2022
  142. Elijah NewrenJul 21, 2022
  143. Derrick StoleeJul 21, 2022
  144. Phillip WoodJul 21, 2022

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.