commit ec14223553994e0603b09629416f7fb8fbf8bf69 from: Stefan Sperling date: Thu Mar 07 12:06:01 2019 UTC unveil worktree in cmd_log() for tog as well commit - eb73a30f7effc51c1cfee2864102635e3659f87a commit + ec14223553994e0603b09629416f7fb8fbf8bf69 blob - bcd487ce2393452b877f145715ad8a777fa95c70 blob + b280c65b2df01713b7f9a527030b9898c8fb0847 --- tog/tog.c +++ tog/tog.c @@ -1792,6 +1792,7 @@ cmd_log(int argc, char *argv[]) { const struct got_error *error; struct got_repository *repo = NULL; + struct got_worktree *worktree = NULL; struct got_reflist_head refs; struct got_object_id *start_id = NULL; char *path = NULL, *repo_path = NULL, *cwd = NULL; @@ -1839,14 +1840,12 @@ cmd_log(int argc, char *argv[]) goto done; } if (repo_path == NULL) { - struct got_worktree *worktree; error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) goto done; if (worktree) { repo_path = strdup(got_worktree_get_repo_path(worktree)); - got_worktree_close(worktree); } else repo_path = strdup(cwd); if (repo_path == NULL) { @@ -1857,7 +1856,8 @@ cmd_log(int argc, char *argv[]) init_curses(); - error = apply_unveil(repo_path, NULL); + error = apply_unveil(repo_path, + worktree ? got_worktree_get_root_path(worktree) : NULL); if (error) goto done; @@ -1894,6 +1894,8 @@ done: free(start_id); if (repo) got_repo_close(repo); + if (worktree) + got_worktree_close(worktree); return error; }