diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-27 15:09:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-27 15:09:47 -0700 |
| commit | 26bb5437f6defed72996b6a2bb1ff9121ec297ff (patch) | |
| tree | 49ff7b4d03f4d7b447a5575845491b764ba376c2 /builtin | |
| parent | Merge branch 'rs/tighten-callers-of-deref-tag' (diff) | |
| parent | worktree: teach `list` to annotate locked worktree (diff) | |
| download | tgif-26bb5437f6defed72996b6a2bb1ff9121ec297ff.tar.xz | |
Merge branch 'rs/worktree-list-show-locked'
"git worktree list" now shows if each worktree is locked. This
possibly may open us to show other kinds of states in the future.
* rs/worktree-list-show-locked:
worktree: teach `list` to annotate locked worktree
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/worktree.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index 99abaeec6c..ce56fdaaa9 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -676,8 +676,11 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len) } else strbuf_addstr(&sb, "(error)"); } - printf("%s\n", sb.buf); + if (!is_main_worktree(wt) && worktree_lock_reason(wt)) + strbuf_addstr(&sb, " locked"); + + printf("%s\n", sb.buf); strbuf_release(&sb); } |