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

Re: [PATCH v2 0/5] Create branch_checked_out() helper

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Jun 19, 2022, 13:58 UTC
Message-ID
<e562bd1b-8be6-db70-923a-cfa27c3edb36@gmail.com>
In-Reply-To
<pull.1254.v2.git.1655234853.gitgitgadget@gmail.com>
Hi Stolee
On 14/06/2022 20:27, Derrick Stolee via GitGitGadget wrote:
Show 47 quoted lines
> This is a replacement for some patches from v2 of my 'git rebase
> --update-refs' topic [1]. After some feedback from Philip, I've decided to
> pull that topic while I rework how I track the refs to rewrite [2]. This
> series moves forward with the branch_checked_out() helper that was a bit
> more complicated than expected at first glance. This series is a culmination
> of the discussion started by Junio at [3].
> 
> [1]
> https://lore.kernel.org/git/pull.1247.v2.git.1654634569.gitgitgadget@gmail.com
> [2]
> https://lore.kernel.org/git/34264915-8a37-62db-f954-0b5297639b34@github.com/
> [3] https://lore.kernel.org/git/xmqqr140t9am.fsf@gitster.g/
> 
> Here is the patch outline:
> 
>   1. Add a basic form of branch_checked_out() that only looks at the HEAD of
>      each worktree. Since this doesn't look at BISECT_HEAD or REBASE_HEAD,
>      the helper isn't linked to any consumer in this patch. A test script is
>      added that verifies the current behavior checks that are implemented,
>      even if they are not connected yet.
>   2. Make branch_checked_out() actually look at BISECT_HEAD and REBASE_HEAD.
>      Add tests for those cases, which was previously untested in the Git test
>      suite. Use branch_checked_out() in 'git branch -f' to demonstrate this
>      helper works as expected.
>   3. Use branch_checked_out() in 'git fetch' when checking refs that would be
>      updated by the refspec. Add tests for that scenario, too.
>   4. Use branch_checked_out() in 'git branch -D' to prevent deleting refs
>      from under an existing checkout. The commit message here describes some
>      barriers to removing other uses of find_shared_symref() that could be
>      good investigations for later.
>   5. Be careful when constructing the strmap to free old values, even though
>      this should only happen in error scenarios. Add tests that verify this
>      behavior.
> 
> 
> Updates in v2
> =============
> 
>   * branch_checked_out() has a new prototype where it returns a 'const char
>     *' instead of copying the path.
>   * The test script is marked with TEST_PASSES_SANITIZE_LEAK and test are
>     careful to avoid using 'git rebase' or 'git bisect' when possible.
>   * Tests that cannot avoid memory-loss from 'git fetch' are marked with the
>     "!SANITIZE_LEAK" prereq.
>   * A previous replacement of 'wt->current' with 'path' is removed. This
>     changes an error message, but it is a very rare scenario where this error
>     would be output.

The changes look good to me (modulo Peff's fixup), thanks for working on this

Best Wishes
Phillip
Previous: Derrick Stolee via GitGitGadget
Message 28 of 28 in “Create branch_checked_out() helper”
  1. 0/4 Create branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 8, 2022
  2. 1/4 branch: add branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 8, 2022
  3. Junio C HamanoJun 9, 2022
  4. Ævar Arnfjörð BjarmasonJun 13, 2022
  5. Derrick StoleeJun 14, 2022
  6. Ævar Arnfjörð BjarmasonJun 14, 2022
  7. Phillip WoodJun 14, 2022
  8. Phillip WoodJun 14, 2022
  9. Derrick StoleeJun 14, 2022
  10. 2/4 branch: check for bisects and rebasesDerrick Stolee via GitGitGadget, Jun 8, 2022
  11. Junio C HamanoJun 8, 2022
  12. 3/4 fetch: use new branch_checked_out() and add testsDerrick Stolee via GitGitGadget, Jun 8, 2022
  13. Ævar Arnfjörð BjarmasonJun 14, 2022
  14. Phillip WoodJun 14, 2022
  15. Derrick StoleeJun 14, 2022
  16. 4/4 branch: use branch_checked_out() when deleting refsDerrick Stolee via GitGitGadget, Jun 8, 2022
  17. 5/5 branch: fix branch_checked_out() leaksDerrick Stolee, Jun 13, 2022
  18. Junio C HamanoJun 13, 2022
  19. Ævar Arnfjörð BjarmasonJun 14, 2022
  20. Derrick StoleeJun 14, 2022
  21. Ævar Arnfjörð BjarmasonJun 14, 2022
  22. 0/5 Create branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 14, 2022
  23. 1/5 branch: add branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 14, 2022
  24. 2/5 branch: check for bisects and rebasesDerrick Stolee via GitGitGadget, Jun 14, 2022
  25. 3/5 fetch: use new branch_checked_out() and add testsDerrick Stolee via GitGitGadget, Jun 14, 2022
  26. 4/5 branch: use branch_checked_out() when deleting refsDerrick Stolee via GitGitGadget, Jun 14, 2022
  27. 5/5 branch: fix branch_checked_out() leaksDerrick Stolee via GitGitGadget, Jun 14, 2022
  28. Phillip WoodJun 19, 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.