Commit Diff


commit - 3fb2130a1acdb6b75c8c39c903f845c49d835a2bed1f53efea0675903367e589
commit + 9f36809872a2f83a341568b0c94a0506dc75c6ad0f7abc5f1363b7fc9da3bb77
blob - 085a2eada2eb0747cd173137825778b982c13c3f4fc706c274c6df29c6c22db1
blob + 6073909ef39f244e119a8643edb780623ee2b267e41ac765f1b2adef9bfa7395
--- got/got.c	
+++ got/got.c	
@@ -327,8 +327,8 @@ get_editor(char **abspath)
 }
 
 static const struct got_error *
-apply_unveil(const char *repo_path, int repo_read_only,
-    const char *worktree_path)
+apply_unveil_internal(const char *repo_path, int repo_read_only,
+    const char *worktree_path, const char *worktree_perms)
 {
 	const struct got_error *err;
 
@@ -339,7 +339,7 @@ apply_unveil(const char *repo_path, int repo_read_only
 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
 		return got_error_from_errno2("unveil", repo_path);
 
-	if (worktree_path && unveil(worktree_path, "rwc") != 0)
+	if (worktree_path && unveil(worktree_path, worktree_perms) != 0)
 		return got_error_from_errno2("unveil", worktree_path);
 
 	if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
@@ -355,6 +355,22 @@ apply_unveil(const char *repo_path, int repo_read_only
 	return NULL;
 }
 
+static const struct got_error *
+apply_unveil(const char *repo_path, int repo_read_only,
+    const char *worktree_path)
+{
+	return apply_unveil_internal(repo_path, repo_read_only,
+	    worktree_path, "rwc");
+}
+
+static const struct got_error *
+apply_unveil_worktree_ro(const char *repo_path, int repo_read_only,
+    const char *worktree_path)
+{
+	return apply_unveil_internal(repo_path, repo_read_only,
+	    worktree_path, "r");
+}
+
 __dead static void
 usage_init(int status)
 {
@@ -2562,7 +2578,8 @@ cmd_fetch(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
+		error = got_worktree_open_shared(&worktree, cwd,
+		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
 		else
@@ -4888,7 +4905,7 @@ cmd_log(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd,
+		error = got_worktree_open_shared(&worktree, cwd,
 		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
@@ -4924,7 +4941,7 @@ cmd_log(int argc, char *argv[])
 	if (error != NULL)
 		goto done;
 
-	error = apply_unveil(got_repo_get_path(repo), 1,
+	error = apply_unveil_worktree_ro(got_repo_get_path(repo), 1,
 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
 	if (error)
 		goto done;
@@ -5441,7 +5458,7 @@ cmd_diff(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd,
+		error = got_worktree_open_shared(&worktree, cwd,
 		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
@@ -5490,7 +5507,7 @@ cmd_diff(int argc, char *argv[])
 		}
 	}
 
-	error = apply_unveil(got_repo_get_path(repo), 1,
+	error = apply_unveil_worktree_ro(got_repo_get_path(repo), 1,
 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
 	if (error)
 		goto done;
@@ -6015,7 +6032,7 @@ cmd_blame(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd,
+		error = got_worktree_open_shared(&worktree, cwd,
 		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
@@ -6420,7 +6437,7 @@ cmd_tree(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd,
+		error = got_worktree_open_shared(&worktree, cwd,
 		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
@@ -6727,7 +6744,7 @@ cmd_status(int argc, char *argv[])
 	if (error != NULL)
 		goto done;
 
-	error = got_worktree_open(&worktree, cwd,
+	error = got_worktree_open_shared(&worktree, cwd,
 	    GOT_WORKTREE_GOT_DIR);
 	if (error) {
 		if (error->code == GOT_ERR_NOT_WORKTREE)
@@ -6740,7 +6757,7 @@ cmd_status(int argc, char *argv[])
 	if (error != NULL)
 		goto done;
 
-	error = apply_unveil(got_repo_get_path(repo), 1,
+	error = apply_unveil_worktree_ro(got_repo_get_path(repo), 1,
 	    got_worktree_get_root_path(worktree));
 	if (error)
 		goto done;
@@ -6996,7 +7013,7 @@ cmd_ref(int argc, char *argv[])
 	}
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd,
+		error = got_worktree_open_shared(&worktree, cwd,
 		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
@@ -7031,7 +7048,7 @@ cmd_ref(int argc, char *argv[])
 	}
 #endif
 
-	error = apply_unveil(got_repo_get_path(repo), do_list,
+	error = apply_unveil_worktree_ro(got_repo_get_path(repo), do_list,
 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
 	if (error)
 		goto done;
@@ -7375,8 +7392,13 @@ cmd_branch(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd,
-		    GOT_WORKTREE_GOT_DIR);
+		if (do_list || do_show) {
+			error = got_worktree_open_shared(&worktree, cwd,
+			    GOT_WORKTREE_GOT_DIR);
+		} else {
+			error = got_worktree_open(&worktree, cwd,
+			    GOT_WORKTREE_GOT_DIR);
+		}
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
 		else
@@ -7410,8 +7432,13 @@ cmd_branch(int argc, char *argv[])
 	}
 #endif
 
-	error = apply_unveil(got_repo_get_path(repo), do_list,
-	    worktree ? got_worktree_get_root_path(worktree) : NULL);
+	if (do_list || do_show) {
+		error = apply_unveil_worktree_ro(got_repo_get_path(repo), 1,
+		    worktree ? got_worktree_get_root_path(worktree) : NULL);
+	} else {
+		error = apply_unveil(got_repo_get_path(repo), 0,
+		    worktree ? got_worktree_get_root_path(worktree) : NULL);
+	}
 	if (error)
 		goto done;
 
@@ -8121,7 +8148,7 @@ cmd_tag(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd,
+		error = got_worktree_open_shared(&worktree, cwd,
 		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
@@ -10209,7 +10236,8 @@ cmd_send(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
+		error = got_worktree_open_shared(&worktree, cwd,
+		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
 		else
@@ -14654,7 +14682,8 @@ cmd_cat(int argc, char *argv[])
 		goto done;
 
 	if (repo_path == NULL) {
-		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
+		error = got_worktree_open_shared(&worktree, cwd,
+		    GOT_WORKTREE_GOT_DIR);
 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
 			goto done;
 		if (worktree) {
@@ -14903,7 +14932,7 @@ cmd_info(int argc, char *argv[])
 		goto done;
 	}
 
-	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
+	error = got_worktree_open_shared(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
 	if (error) {
 		if (error->code == GOT_ERR_NOT_WORKTREE)
 			error = wrap_not_worktree_error(error, "info", cwd);
@@ -14920,7 +14949,8 @@ cmd_info(int argc, char *argv[])
 	if (pledge("stdio rpath flock unveil", NULL) == -1)
 		err(1, "pledge");
 #endif
-	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
+	error = apply_unveil_worktree_ro(NULL, 0,
+	    got_worktree_get_root_path(worktree));
 	if (error)
 		goto done;