From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
rappazzo@gmail.com, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 2/3] get_worktrees() must return main worktree as first item even on error
Date: Tue, 22 Nov 2016 17:00:45 +0700 [thread overview]
Message-ID: <20161122100046.8341-3-pclouds@gmail.com> (raw)
In-Reply-To: <20161122100046.8341-1-pclouds@gmail.com>
This is required by git-worktree.txt, stating that the main worktree is
the first line (especially in --porcelain mode when we can't just change
behavior at will).
There's only one case when get_worktrees() may skip main worktree, when
parse_ref() fails. Update the code so that we keep first item as main
worktree and return something sensible in this case:
- In user-friendly mode, since we're not constraint by anything,
returning "(error)" should do the job (we already show "(detached
HEAD)" which is not machine-friendly). Actually errors should be
printed on stderr by parse_ref() (*)
- In plumbing mode, we do not show neither 'bare', 'detached' or
'branch ...', which is possible by the format description if I read
it right.
Careful readers may realize that when the local variable "head_ref" in
get_main_worktree() is emptied, add_head_info() will do nothing to
wt->head_sha1. But that's ok because head_sha1 is zero-ized in the
previous patch.
(*) Well, it does not. But it's supposed to be a stop gap
implementation until refs we can reuse code, to parse "ref: " stuff
in HEAD, from resolve_refs_unsafe(). Now may be the time since
refs refactoring is mostly done.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/worktree.c | 8 +++++---
worktree.c | 6 ++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 5c4854d..b835b91 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -388,7 +388,7 @@ static void show_worktree_porcelain(struct worktree *wt)
printf("HEAD %s\n", sha1_to_hex(wt->head_sha1));
if (wt->is_detached)
printf("detached\n");
- else
+ else if (wt->head_ref)
printf("branch %s\n", wt->head_ref);
}
printf("\n");
@@ -406,10 +406,12 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
else {
strbuf_addf(&sb, "%-*s ", abbrev_len,
find_unique_abbrev(wt->head_sha1, DEFAULT_ABBREV));
- if (!wt->is_detached)
+ if (wt->is_detached)
+ strbuf_addstr(&sb, "(detached HEAD)");
+ else if (wt->head_ref)
strbuf_addf(&sb, "[%s]", shorten_unambiguous_ref(wt->head_ref, 0));
else
- strbuf_addstr(&sb, "(detached HEAD)");
+ strbuf_addstr(&sb, "(error)");
}
printf("%s\n", sb.buf);
diff --git a/worktree.c b/worktree.c
index f7c1b5e..a674efa 100644
--- a/worktree.c
+++ b/worktree.c
@@ -89,7 +89,7 @@ static struct worktree *get_main_worktree(void)
strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
if (parse_ref(path.buf, &head_ref, &is_detached) < 0)
- goto done;
+ strbuf_reset(&head_ref);
worktree = xcalloc(1, sizeof(*worktree));
worktree->path = strbuf_detach(&worktree_path, NULL);
@@ -97,7 +97,6 @@ static struct worktree *get_main_worktree(void)
worktree->is_detached = is_detached;
add_head_info(&head_ref, worktree);
-done:
strbuf_release(&path);
strbuf_release(&worktree_path);
strbuf_release(&head_ref);
@@ -173,8 +172,7 @@ struct worktree **get_worktrees(void)
list = xmalloc(alloc * sizeof(struct worktree *));
- if ((list[counter] = get_main_worktree()))
- counter++;
+ list[counter++] = get_main_worktree();
strbuf_addf(&path, "%s/worktrees", get_git_common_dir());
dir = opendir(path.buf);
--
2.8.2.524.g6ff3d78
next prev parent reply other threads:[~2016-11-22 10:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 10:00 [PATCH 0/3] Minor fixes on 'git worktree' Nguyễn Thái Ngọc Duy
2016-11-22 10:00 ` [PATCH 1/3] worktree.c: zero new 'struct worktree' on allocation Nguyễn Thái Ngọc Duy
2016-11-23 16:52 ` Junio C Hamano
2016-11-22 10:00 ` Nguyễn Thái Ngọc Duy [this message]
2016-11-23 17:06 ` [PATCH 2/3] get_worktrees() must return main worktree as first item even on error Junio C Hamano
2016-11-22 10:00 ` [PATCH 3/3] worktree list: keep the list sorted Nguyễn Thái Ngọc Duy
2016-11-23 17:16 ` Junio C Hamano
2016-11-25 12:19 ` Duy Nguyen
2016-11-23 16:52 ` [PATCH 0/3] Minor fixes on 'git worktree' Junio C Hamano
2016-11-25 12:24 ` Duy Nguyen
2016-11-25 13:44 ` Duy Nguyen
2016-11-28 19:36 ` Junio C Hamano
2016-11-28 9:36 ` [PATCH v2 0/5] nd/worktree-list-fixup Nguyễn Thái Ngọc Duy
2016-11-28 9:36 ` [PATCH v2 1/5] worktree.c: zero new 'struct worktree' on allocation Nguyễn Thái Ngọc Duy
2016-11-28 9:36 ` [PATCH v2 2/5] worktree: reorder an if statement Nguyễn Thái Ngọc Duy
2016-11-28 9:36 ` [PATCH v2 3/5] get_worktrees() must return main worktree as first item even on error Nguyễn Thái Ngọc Duy
2016-11-28 9:36 ` [PATCH v2 4/5] worktree.c: get_worktrees() takes a new flag argument Nguyễn Thái Ngọc Duy
2016-11-28 9:36 ` [PATCH v2 5/5] worktree list: keep the list sorted Nguyễn Thái Ngọc Duy
2016-11-28 21:25 ` [PATCH v2 0/5] nd/worktree-list-fixup Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161122100046.8341-3-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rappazzo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).