Commit 9bf7a39bbdb96e580c0dd2961b2ef382a014dd3f
2019-02-05T18:07:33
make 'got tree' behave as advertised in subdirs of a work tree
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
diff --git a/got/got.c b/got/got.c
index a4dec16..b4eef2f 100644
--- a/got/got.c
+++ b/got/got.c
@@ -1292,12 +1292,12 @@ cmd_tree(int argc, char *argv[])
else
path = NULL;
+ cwd = getcwd(NULL, 0);
+ if (cwd == NULL) {
+ error = got_error_from_errno();
+ goto done;
+ }
if (repo_path == NULL) {
- cwd = getcwd(NULL, 0);
- if (cwd == NULL) {
- error = got_error_from_errno();
- goto done;
- }
error = got_worktree_open(&worktree, cwd);
if (error && (error->code != GOT_ERR_ERRNO && errno != ENOENT))
goto done;
@@ -1310,8 +1310,6 @@ cmd_tree(int argc, char *argv[])
error = got_error_from_errno();
if (error)
goto done;
- if (path == NULL)
- path = got_worktree_get_path_prefix(worktree);
} else {
repo_path = strdup(cwd);
if (repo_path == NULL) {
@@ -1329,11 +1327,28 @@ cmd_tree(int argc, char *argv[])
if (error != NULL)
goto done;
- if (path == NULL)
- path = "/";
- error = got_repo_map_path(&in_repo_path, repo, path, 1);
- if (error != NULL)
- goto done;
+ if (path == NULL) {
+ if (worktree) {
+ char *p, *worktree_subdir = cwd +
+ strlen(got_worktree_get_root_path(worktree));
+ if (asprintf(&p, "%s/%s",
+ got_worktree_get_path_prefix(worktree),
+ worktree_subdir) == -1) {
+ error = got_error_from_errno();
+ goto done;
+ }
+ error = got_repo_map_path(&in_repo_path, repo, p, 1);
+ free(p);
+ if (error)
+ goto done;
+ } else
+ path = "/";
+ }
+ if (in_repo_path == NULL) {
+ error = got_repo_map_path(&in_repo_path, repo, path, 1);
+ if (error != NULL)
+ goto done;
+ }
if (commit_id_str == NULL) {
struct got_reference *head_ref;