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

Re: [PATCH 3/9] worktree: generalize delete_git_dir() to reduce code duplication

From
Jeff King <peff@peff.net>
Date
Aug 30, 2018, 06:57 UTC
Message-ID
<20180830065734.GA11944@sigill.intra.peff.net>
In-Reply-To
<20180828212026.21989-4-sunshine@sunshineco.com>
On Tue, Aug 28, 2018 at 05:20:20PM -0400, Eric Sunshine wrote:
Show 9 quoted lines
> prune_worktrees() and delete_git_dir() both remove worktree
> administrative entries from .git/worktrees, and their implementations
> are nearly identical. The only difference is that prune_worktrees() is
> also capable of removing a bogus non-worktree-related file from
> .git/worktrees.
> 
> Simplify by extending delete_git_dir() to handle the little bit of
> extra functionality needed by prune_worktrees(), and drop the
> effectively duplicate code from the latter.

Makes sense. The name "delete_git_dir()" is a little funny (I assume it means "the git dir", not a worktree's git-dir), but that is not new (and it's static in worktree.c, which helps).

Your patch maybe stretches that a little by deleting non-directories. Maybe delete_from_worktrees() would be a better name. Probably not worth a re-roll, though.

-Peff
Previous: Eric SunshineNext: Eric Sunshine
Message 6 of 28 in “worktree: fix bugs and broaden --force applicability”
  1. 0/9 worktree: fix bugs and broaden --force applicabilityEric Sunshine, Aug 28, 2018
  2. 1/9 worktree: don't die() in library function find_worktree()Eric Sunshine, Aug 28, 2018
  3. 2/9 worktree: move delete_git_dir() earlier in file for upcoming new callersEric Sunshine, Aug 28, 2018
  4. 4/9 worktree: prepare for more checks of whether path can become worktreeEric Sunshine, Aug 28, 2018
  5. 3/9 worktree: generalize delete_git_dir() to reduce code duplicationEric Sunshine, Aug 28, 2018
  6. Jeff KingAug 30, 2018
  7. Eric SunshineAug 30, 2018
  8. 6/9 worktree: teach 'add' to respect --force for registered but missing pathEric Sunshine, Aug 28, 2018
  9. Jeff KingAug 30, 2018
  10. Eric SunshineAug 30, 2018
  11. 8/9 worktree: teach 'remove' to override lock when --force given twiceEric Sunshine, Aug 28, 2018
  12. Jeff KingAug 30, 2018
  13. Eric SunshineAug 30, 2018
  14. 9/9 worktree: delete .git/worktrees if empty after 'remove'Eric Sunshine, Aug 28, 2018
  15. 7/9 worktree: teach 'move' to override lock when --force given twiceEric Sunshine, Aug 28, 2018
  16. Jeff KingAug 30, 2018
  17. Eric SunshineAug 30, 2018
  18. 5/9 worktree: disallow adding same path multiple timesEric Sunshine, Aug 28, 2018
  19. Jeff KingAug 30, 2018
  20. Eric SunshineAug 30, 2018
  21. Jeff KingAug 30, 2018
  22. Eric SunshineAug 30, 2018
  23. Eric SunshineAug 30, 2018
  24. Jeff KingAug 30, 2018
  25. Junio C HamanoAug 30, 2018
  26. Ramsay JonesAug 30, 2018
  27. Jeff KingAug 31, 2018
  28. Ramsay JonesAug 31, 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.