Skip to content

various wt-status/worktree cleanups

Martin Ågren git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest7 patches 3 repliesIn review
  2. v18 patches 13 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7wt-status: replace sha1 mentions with oidwt-status.c+4 -40 replies
2/7wt-status: print to s->fp, not stdoutwt-status.c+32 -250 replies
3/7wt-status: introduce wt_status_state_free_buffers()ref-filter.c worktree.c wt-status.c +1 more+18 -90 replies
4/7worktree: inline `worktree_ref()` into its only callerworktree.c worktree.h+6 -183 replies
5/7worktree: update renamed variable in commentworktree.c+1 -10 replies
6/7worktree: rename copy-pasted variableworktree.c+6 -60 replies
7/7worktree: use skip_prefix to parse targetworktree.c+7 -70 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/7] various wt-status/worktree cleanups

Here's a belated update of my series to clean up wt-status.c and worktree.c a bit.

The buggy fourth patch has been removed and replaced with one that inlines worktree_ref() into its only caller. Thanks Eric for spotting my initial bug and for the very helpful discussion.

The final patch, "worktree: simplify search for unique worktree" is no longer. It felt like it was quite subjective whether it was a "simplification", so let's not spend reviewer quality time on it.

Martin Ågren (7):
wt-status: replace sha1 mentions with oid
wt-status: print to s->fp, not stdout
wt-status: introduce wt_status_state_free_buffers()
worktree: inline worktree_ref() into its only caller
worktree: update renamed variable in comment
worktree: rename copy-pasted variable
worktree: use skip_prefix to parse target

 worktree.h   |  7 -----
 wt-status.h  |  7 +++++
 ref-filter.c |  4 +--
 worktree.c   | 46 ++++++++++++++-----------------
 wt-status.c  | 76 ++++++++++++++++++++++++++++++----------------------
 5 files changed, 72 insertions(+), 68 deletions(-)

Range-diff against v1:

1:  734ea28eff = 1:  734ea28eff wt-status: replace sha1 mentions with oid
2:  7ada884d7c = 2:  7ada884d7c wt-status: print to s->fp, not stdout
3:  c08fed5a01 = 3:  c08fed5a01 wt-status: introduce wt_status_state_free_buffers()
4:  58a2469cc1 < -:  ---------- worktree: drop useless call to strbuf_reset
-:  ---------- > 4:  c4825f461e worktree: inline `worktree_ref()` into its only caller
5:  9c1e321fbc = 5:  dbbc57cd83 worktree: update renamed variable in comment
6:  6d913ea3e0 = 6:  70e6cea331 worktree: rename copy-pasted variable
7:  872dc384c5 = 7:  f8fbee6234 worktree: use skip_prefix to parse target
8:  8383c246f8 < -:  ---------- worktree: simplify search for unique worktree
Signature · 1 line
2.28.0.277.g9b3c35fffd