Commit c156c7a4f456c171f9e458793a2baa06389f8e1e
2020-12-18T19:19:46
do not mix up repositories if tog's -r option is used inside a work tree with input from and ok naddy
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 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
diff --git a/tog/tog.c b/tog/tog.c
index 334d9a6..d3d4a63 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -2702,24 +2702,22 @@ 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);
@@ -3789,24 +3787,22 @@ cmd_diff(int argc, char *argv[])
} 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);
@@ -4679,24 +4675,22 @@ 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);