[PATCH v2 07/20] checkout: check_linked_checkout: simplify symref parsing
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 16, 2015, 08:20 UTC
- Message-ID
- <1437034825-32054-8-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1437034825-32054-1-git-send-email-sunshine@sunshineco.com>
check_linked_checkout() only understands symref-style HEAD (i.e. "ref: refs/heads/master"), however, HEAD may also be a an actual symbolic link (on platforms which support it), thus it will need to check that style HEAD, as well (via readlink()). As a preparatory step, simplify parsing of symref-style HEAD so the actual branch check can be re-used easily for symbolic links (in an upcoming patch).
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> ---
New in v2: code cleanup in preparation for new patch 08/20.
builtin/checkout.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c index a331345..3487712 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -878,7 +878,6 @@ static void check_linked_checkout(const char *branch, const char *id) struct strbuf sb = STRBUF_INIT; struct strbuf path = STRBUF_INIT; struct strbuf gitdir = STRBUF_INIT; - const char *start, *end; /* * $GIT_COMMON_DIR/HEAD is practically outside @@ -890,15 +889,13 @@ static void check_linked_checkout(const char *branch, const char *id) else strbuf_addf(&path, "%s/HEAD", get_git_common_dir()); - if (strbuf_read_file(&sb, path.buf, 0) < 0 || - !skip_prefix(sb.buf, "ref:", &start)) + if (strbuf_read_file(&sb, path.buf, 0) >= 0 && + starts_with(sb.buf, "ref:")) { + strbuf_remove(&sb, 0, strlen("ref:")); + strbuf_trim(&sb); + } else goto done; - while (isspace(*start)) - start++; - end = start; - while (*end && !isspace(*end)) - end++; - if (strncmp(start, branch, end - start) || branch[end - start] != '\0') + if (strcmp(sb.buf, branch)) goto done; if (id) { strbuf_reset(&path);
-- 2.5.0.rc2.378.g0af52e8