commit - 056e7441d0bdfa8d8f7b240b34841190cf1864b4
commit + 8eac252b90e100faf4066b589250cfa50dab2fbd
blob - b6bb45f3bb8490bef65f1913b4597ca9ec45db21
blob + 049c003bda38f5fb97f02544ad16b126d98ba8c8
--- regress/worktree/worktree_test.c
+++ regress/worktree/worktree_test.c
}
static int
+obstruct_meta_file_and_init(int *ok, struct got_repository *repo,
+ const char *worktree_path, char *name)
+{
+ const struct got_error *err;
+ char *path;
+ int ret = 0;
+ struct got_reference *head_ref = NULL;
+
+ if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_FILE_INDEX))
+ return 0;
+
+ err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
+ if (err != NULL || head_ref == NULL)
+ return 0;
+
+ err = got_worktree_init(worktree_path, head_ref, "/", repo);
+ if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
+ (*ok)++;
+ ret = 1;
+ }
+ unlink(path);
+ free(path);
+ got_ref_close(head_ref);
+ return ret;
+}
+
+static int
worktree_init_exists(const char *repo_path)
{
const struct got_error *err;
struct got_repository *repo = NULL;
- struct got_reference *head_ref = NULL;
char worktree_path[PATH_MAX];
char *gotpath = NULL;
char *path;
err = got_repo_open(&repo, repo_path);
if (err != NULL || repo == NULL)
goto done;
- err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
- if (err != NULL || head_ref == NULL)
- goto done;
-
strlcpy(worktree_path, "worktree-XXXXXX", sizeof(worktree_path));
if (mkdtemp(worktree_path) == NULL)
goto done;
goto done;
/* Create files which got_worktree_init() will try to create as well. */
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_REF_HEAD))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_REF_HEAD))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_LOCK))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_LOCK))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_FILE_INDEX))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_FILE_INDEX))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_REPOSITORY))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_REPOSITORY))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_PATH_PREFIX))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_PATH_PREFIX))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_FORMAT))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_FORMAT))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
done:
- if (head_ref)
- got_ref_close(head_ref);
if (repo)
got_repo_close(repo);
free(gotpath);