global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

worktree: refactor infer_backlink() to use *strbuf

Browse Source 
This lays the groundwork for the next patch, which needs the backlink
returned from infer_backlink() as a `strbuf`. It seemed inefficient to
convert from `strbuf` to `char*` and back to `strbuf` again.

This refactors infer_backlink() to return an integer result and use a
pre-allocated `strbuf` for the inferred backlink path, replacing the
previous `char*` return type and improving efficiency.

Signed-off-by: Caleb White <cdwhite3@pm.me>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Caleb White
2024-10-07 22:12:30 -05:00
committed by Junio C Hamano
parent 58d8805de2
commit bb4a883584
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
worktree.c
View File

@@ -642,10 +642,9 @@ static int is_main_worktree_path(const char *path)
* be able to infer the gitdir by manually reading /path/to/worktree/.git, * be able to infer the gitdir by manually reading /path/to/worktree/.git,
* extracting the <id>, and checking if <repo>/worktrees/<id> exists. * extracting the <id>, and checking if <repo>/worktrees/<id> exists.
*/ */
static char *infer_backlink(const char *gitfile) static int infer_backlink(const char *gitfile, struct strbuf *inferred)
{ {
struct strbuf actual = STRBUF_INIT; struct strbuf actual = STRBUF_INIT;
struct strbuf inferred = STRBUF_INIT;
const char *id; const char *id;
if (strbuf_read_file(&actual, gitfile, 0) < 0) if (strbuf_read_file(&actual, gitfile, 0) < 0)
@@ -658,17 +657,18 @@ static char *infer_backlink(const char *gitfile)
id++; /* advance past '/' to point at <id> */ id++; /* advance past '/' to point at <id> */
if (!*id) if (!*id)
goto error; goto error;
strbuf_git_common_path(&inferred, the_repository, "worktrees/%s", id); strbuf_reset(inferred);
if (!is_directory(inferred.buf)) strbuf_git_common_path(inferred, the_repository, "worktrees/%s", id);
if (!is_directory(inferred->buf))
goto error; goto error;
strbuf_release(&actual); strbuf_release(&actual);
return strbuf_detach(&inferred, NULL); return 1;
error: error:
strbuf_release(&actual); strbuf_release(&actual);
strbuf_release(&inferred); strbuf_reset(inferred); /* clear invalid path */
return NULL; return 0;
} }
/* /*
@@ -680,10 +680,11 @@ void repair_worktree_at_path(const char *path,
{ {
struct strbuf dotgit = STRBUF_INIT; struct strbuf dotgit = STRBUF_INIT;
struct strbuf realdotgit = STRBUF_INIT; struct strbuf realdotgit = STRBUF_INIT;
struct strbuf backlink = STRBUF_INIT;
struct strbuf inferred_backlink = STRBUF_INIT;
struct strbuf gitdir = STRBUF_INIT; struct strbuf gitdir = STRBUF_INIT;
struct strbuf olddotgit = STRBUF_INIT; struct strbuf olddotgit = STRBUF_INIT;
char *backlink = NULL; char *dotgit_contents = NULL;
char *inferred_backlink = NULL;
const char *repair = NULL; const char *repair = NULL;
int err; int err;
@@ -699,23 +700,23 @@ void repair_worktree_at_path(const char *path,
goto done; goto done;
} }
inferred_backlink = infer_backlink(realdotgit.buf); infer_backlink(realdotgit.buf, &inferred_backlink);
backlink = xstrdup_or_null(read_gitfile_gently(realdotgit.buf, &err)); dotgit_contents = xstrdup_or_null(read_gitfile_gently(realdotgit.buf, &err));
if (err == READ_GITFILE_ERR_NOT_A_FILE) { if (dotgit_contents) {
strbuf_addstr(&backlink, dotgit_contents);
} else if (err == READ_GITFILE_ERR_NOT_A_FILE) {
fn(1, realdotgit.buf, _("unable to locate repository; .git is not a file"), cb_data); fn(1, realdotgit.buf, _("unable to locate repository; .git is not a file"), cb_data);
goto done; goto done;
} else if (err == READ_GITFILE_ERR_NOT_A_REPO) { } else if (err == READ_GITFILE_ERR_NOT_A_REPO) {
if (inferred_backlink) { if (inferred_backlink.len) {
/* /*
* Worktree's .git file does not point at a repository * Worktree's .git file does not point at a repository
* but we found a .git/worktrees/<id> in this * but we found a .git/worktrees/<id> in this
* repository with the same <id> as recorded in the * repository with the same <id> as recorded in the
* worktree's .git file so make the worktree point at * worktree's .git file so make the worktree point at
* the discovered .git/worktrees/<id>. (Note: backlink * the discovered .git/worktrees/<id>.
* is already NULL, so no need to free it first.)
*/ */
backlink = inferred_backlink; strbuf_swap(&backlink, &inferred_backlink);
inferred_backlink = NULL;
} else { } else {
fn(1, realdotgit.buf, _("unable to locate repository; .git file does not reference a repository"), cb_data); fn(1, realdotgit.buf, _("unable to locate repository; .git file does not reference a repository"), cb_data);
goto done; goto done;
@@ -743,13 +744,11 @@ void repair_worktree_at_path(const char *path,
* in the "copy" repository. In this case, point the "copy" worktree's * in the "copy" repository. In this case, point the "copy" worktree's
* .git file at the "copy" repository. * .git file at the "copy" repository.
*/ */
if (inferred_backlink && fspathcmp(backlink, inferred_backlink)) { if (inferred_backlink.len && fspathcmp(backlink.buf, inferred_backlink.buf)) {
free(backlink); strbuf_swap(&backlink, &inferred_backlink);
backlink = inferred_backlink;
inferred_backlink = NULL;
} }
strbuf_addf(&gitdir, "%s/gitdir", backlink); strbuf_addf(&gitdir, "%s/gitdir", backlink.buf);
if (strbuf_read_file(&olddotgit, gitdir.buf, 0) < 0) if (strbuf_read_file(&olddotgit, gitdir.buf, 0) < 0)
repair = _("gitdir unreadable"); repair = _("gitdir unreadable");
else { else {
@@ -763,9 +762,10 @@ void repair_worktree_at_path(const char *path,
write_file(gitdir.buf, "%s", realdotgit.buf); write_file(gitdir.buf, "%s", realdotgit.buf);
} }
done: done:
free(backlink); free(dotgit_contents);
free(inferred_backlink);
strbuf_release(&olddotgit); strbuf_release(&olddotgit);
strbuf_release(&backlink);
strbuf_release(&inferred_backlink);
strbuf_release(&gitdir); strbuf_release(&gitdir);
strbuf_release(&realdotgit); strbuf_release(&realdotgit);
strbuf_release(&dotgit); strbuf_release(&dotgit);