Commit Diff

Commit:
c156c7a4f456c171f9e458793a2baa06389f8e1e
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
do not mix up repositories if tog's -r option is used inside a work tree with input from and ok naddy
Actions:
Patch | Tree
commit - 5a8b373cd01671285df647379299fbc5f49707c1
commit + c156c7a4f456c171f9e458793a2baa06389f8e1e
blob - 334d9a659f385c9de036c79d21a1a527807feeb6
blob + d3d4a63398b4c4b05caa731b093b038b0b1d9bee
--- tog/tog.c
+++ tog/tog.c
@@ -2701,25 +2701,23 @@ cmd_log(int argc, char *argv[])
 
 	if (argc > 1)
 		usage_log();
-
-	cwd = getcwd(NULL, 0);
-	if (cwd == NULL)
-		return got_error_from_errno("getcwd");
-
-	error = got_worktree_open(&worktree, cwd);
-	if (error && error->code != GOT_ERR_NOT_WORKTREE)
-		goto done;
 
 	if (repo_path == NULL) {
+		cwd = getcwd(NULL, 0);
+		if (cwd == NULL)
+			return got_error_from_errno("getcwd");
+		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));
 		else
 			repo_path = strdup(cwd);
-	}
-	if (repo_path == NULL) {
-		error = got_error_from_errno("strdup");
-		goto done;
+		if (repo_path == NULL) {
+			error = got_error_from_errno("strdup");
+			goto done;
+		}
 	}
 
 	error = got_repo_open(&repo, repo_path, NULL);
@@ -3788,25 +3786,23 @@ cmd_diff(int argc, char *argv[])
 		id_str2 = argv[1];
 	} else
 		usage_diff();
-
-	cwd = getcwd(NULL, 0);
-	if (cwd == NULL)
-		return got_error_from_errno("getcwd");
 
-	error = got_worktree_open(&worktree, cwd);
-	if (error && error->code != GOT_ERR_NOT_WORKTREE)
-		goto done;
-
 	if (repo_path == NULL) {
+		cwd = getcwd(NULL, 0);
+		if (cwd == NULL)
+			return got_error_from_errno("getcwd");
+		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));
 		else
 			repo_path = strdup(cwd);
-	}
-	if (repo_path == NULL) {
-		error = got_error_from_errno("strdup");
-		goto done;
+		if (repo_path == NULL) {
+			error = got_error_from_errno("strdup");
+			goto done;
+		}
 	}
 
 	error = got_repo_open(&repo, repo_path, NULL);
@@ -4678,25 +4674,23 @@ cmd_blame(int argc, char *argv[])
 
 	if (argc != 1)
 		usage_blame();
-
-	cwd = getcwd(NULL, 0);
-	if (cwd == NULL)
-		return got_error_from_errno("getcwd");
 
-	error = got_worktree_open(&worktree, cwd);
-	if (error && error->code != GOT_ERR_NOT_WORKTREE)
-		goto done;
-
 	if (repo_path == NULL) {
+		cwd = getcwd(NULL, 0);
+		if (cwd == NULL)
+			return got_error_from_errno("getcwd");
+		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));
 		else
 			repo_path = strdup(cwd);
-	}
-	if (repo_path == NULL) {
-		error = got_error_from_errno("strdup");
-		goto done;
+		if (repo_path == NULL) {
+			error = got_error_from_errno("strdup");
+			goto done;
+		}
 	}
 
 	error = got_repo_open(&repo, repo_path, NULL);
@@ -5491,24 +5485,22 @@ cmd_tree(int argc, char *argv[])
 	if (argc > 1)
 		usage_tree();
 
-	cwd = getcwd(NULL, 0);
-	if (cwd == NULL)
-		return got_error_from_errno("getcwd");
-
-	error = got_worktree_open(&worktree, cwd);
-	if (error && error->code != GOT_ERR_NOT_WORKTREE)
-		goto done;
-
 	if (repo_path == NULL) {
+		cwd = getcwd(NULL, 0);
+		if (cwd == NULL)
+			return got_error_from_errno("getcwd");
+		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));
 		else
 			repo_path = strdup(cwd);
-	}
-	if (repo_path == NULL) {
-		error = got_error_from_errno("strdup");
-		goto done;
+		if (repo_path == NULL) {
+			error = got_error_from_errno("strdup");
+			goto done;
+		}
 	}
 
 	error = got_repo_open(&repo, repo_path, NULL);
@@ -6212,24 +6204,22 @@ cmd_ref(int argc, char *argv[])
 	if (argc > 1)
 		usage_ref();
 
-	cwd = getcwd(NULL, 0);
-	if (cwd == NULL)
-		return got_error_from_errno("getcwd");
-
-	error = got_worktree_open(&worktree, cwd);
-	if (error && error->code != GOT_ERR_NOT_WORKTREE)
-		goto done;
-
 	if (repo_path == NULL) {
+		cwd = getcwd(NULL, 0);
+		if (cwd == NULL)
+			return got_error_from_errno("getcwd");
+		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));
 		else
 			repo_path = strdup(cwd);
-	}
-	if (repo_path == NULL) {
-		error = got_error_from_errno("strdup");
-		goto done;
+		if (repo_path == NULL) {
+			error = got_error_from_errno("strdup");
+			goto done;
+		}
 	}
 
 	error = got_repo_open(&repo, repo_path, NULL);