mbox series

[v2,0/7] various wt-status/worktree cleanups

Message ID cover.1600281350.git.martin.agren@gmail.com (mailing list archive)
Headers show
Series various wt-status/worktree cleanups | expand

Message

Martin Ågren Sept. 27, 2020, 1:15 p.m. UTC
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