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

Re: [PATCH 0/4] rebase: update branches in multi-part topic

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 3, 2022, 18:52 UTC
Message-ID
<xmqqr145fuku.fsf@gitster.g>
In-Reply-To
<YppSl4rOvVciLuXE@nand.local>
Taylor Blau <me@ttaylorr.com> writes:
Show 8 quoted lines
> But I wonder if we can or should delay these update-refs as long as
> possible. In particular: what happens if I get past this "exec" line (so
> that I've already updated my bundle-redo/fetch branch to point at the
> new thing), but decide at some later point to abort the rebase?
>
> I think users will expect us to restore bundle-redo/fetch to where it
> was before if we end up in that case. Recovering from it manually sounds
> like kind of a headache.

That is a very good safety and usability concern. I am glad somebody thought of it.

Show 12 quoted lines
> What if instead we created labels here, and then delayed all ref updates
> to the end by replacing this with:
>
>     label bundle-redo/fetch
>
> and then at the end of the todo list we'd add:
>
>     exec git update-ref refs/heads/bundle-redo/fetch refs/rewritten/bundle-redo/fetch
>
> If we do all of those ref updates in a single transaction at the end, it
> should be much easier to roll back from if desired, and we'd avoid the
> aborted-rebase problem entirely.
;-)
Previous: Taylor BlauNext: Jeff Hostetler
Message 13 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.