Commit dae2a678dfc5685c0f121fd205f62439f417dcc5
2021-09-01T20:31:46
backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104
diff --git a/lib/worktree.c b/lib/worktree.c
index 45d0128..9dcec45 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -4840,20 +4840,19 @@ struct collect_commitables_arg {
};
static const struct got_error *
-collect_commitable(struct got_pathlist_head *commitable_paths,
- struct got_worktree *worktree, struct got_fileindex *fileindex,
- unsigned char status, unsigned char staged_status,
- int have_staged_files, int allow_bad_symlinks, const char *relpath,
+collect_commitables(void *arg, unsigned char status,
+ unsigned char staged_status, const char *relpath,
struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
struct got_object_id *commit_id, int dirfd, const char *de_name)
{
+ struct collect_commitables_arg *a = arg;
const struct got_error *err = NULL;
struct got_commitable *ct = NULL;
struct got_pathlist_entry *new = NULL;
char *parent_path = NULL, *path = NULL;
struct stat sb;
- if (have_staged_files) {
+ if (a->have_staged_files) {
if (staged_status != GOT_STATUS_MODIFY &&
staged_status != GOT_STATUS_ADD &&
staged_status != GOT_STATUS_DELETE)
@@ -4889,7 +4888,7 @@ collect_commitable(struct got_pathlist_head *commitable_paths,
goto done;
}
- if (asprintf(&ct->ondisk_path, "%s/%s", worktree->root_path,
+ if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
relpath) == -1) {
err = got_error_from_errno("asprintf");
goto done;
@@ -4898,7 +4897,7 @@ collect_commitable(struct got_pathlist_head *commitable_paths,
if (staged_status == GOT_STATUS_ADD ||
staged_status == GOT_STATUS_MODIFY) {
struct got_fileindex_entry *ie;
- ie = got_fileindex_entry_get(fileindex, path, strlen(path));
+ ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
switch (got_fileindex_entry_staged_filetype_get(ie)) {
case GOT_FILEIDX_MODE_REGULAR_FILE:
case GOT_FILEIDX_MODE_BAD_SYMLINK:
@@ -4928,15 +4927,15 @@ collect_commitable(struct got_pathlist_head *commitable_paths,
ct->mode = sb.st_mode;
}
- if (asprintf(&ct->in_repo_path, "%s%s%s", worktree->path_prefix,
- got_path_is_root_dir(worktree->path_prefix) ? "" : "/",
+ if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
+ got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
relpath) == -1) {
err = got_error_from_errno("asprintf");
goto done;
}
if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
- status == GOT_STATUS_ADD && !allow_bad_symlinks) {
+ status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
int is_bad_symlink;
char target_path[PATH_MAX];
ssize_t target_len;
@@ -4948,7 +4947,7 @@ collect_commitable(struct got_pathlist_head *commitable_paths,
goto done;
}
err = is_bad_symlink_target(&is_bad_symlink, target_path,
- target_len, ct->ondisk_path, worktree->root_path);
+ target_len, ct->ondisk_path, a->worktree->root_path);
if (err)
goto done;
if (is_bad_symlink) {
@@ -4988,7 +4987,7 @@ collect_commitable(struct got_pathlist_head *commitable_paths,
err = got_error_from_errno("strdup");
goto done;
}
- err = got_pathlist_insert(&new, commitable_paths, ct->path, ct);
+ err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
done:
if (ct && (err || new == NULL))
free_commitable(ct);
@@ -4997,19 +4996,6 @@ done:
return err;
}
-static const struct got_error *
-collect_commitables(void *arg, unsigned char status,
- unsigned char staged_status, const char *relpath,
- struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
- struct got_object_id *commit_id, int dirfd, const char *de_name)
-{
- struct collect_commitables_arg *a = arg;
- return collect_commitable(a->commitable_paths, a->worktree,
- a->fileindex, status, staged_status, a->have_staged_files,
- a->allow_bad_symlinks, relpath, blob_id, staged_blob_id,
- commit_id, dirfd, de_name);
-}
-
static const struct got_error *write_tree(struct got_object_id **, int *,
struct got_tree_object *, const char *, struct got_pathlist_head *,
got_worktree_status_cb status_cb, void *status_arg,