Commit 963f97a1f258c5d517ee748dfeb9855262cfad11
2019-03-18T17:16:32
make 'tog log' resolve paths just like 'got log' does it
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
diff --git a/tog/tog.c b/tog/tog.c
index 64b0fb3..1a7431f 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -1854,33 +1854,43 @@ cmd_log(int argc, char *argv[])
argc -= optind;
argv += optind;
- if (argc == 0)
- path = strdup("");
- else if (argc == 1)
- path = strdup(argv[0]);
- else
- usage_log();
- if (path == NULL)
- return got_error_from_errno();
-
cwd = getcwd(NULL, 0);
if (cwd == NULL) {
error = got_error_from_errno();
goto done;
}
- if (repo_path == NULL) {
- 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_worktree_open(&worktree, cwd);
+ if (error && error->code != GOT_ERR_NOT_WORKTREE)
+ goto done;
+ error = NULL;
+
+ if (argc == 0) {
+ path = strdup("");
+ if (path == NULL) {
error = got_error_from_errno();
goto done;
}
+ } else if (argc == 1) {
+ if (worktree) {
+ error = got_worktree_resolve_path(&path, worktree,
+ argv[0]);
+ if (error)
+ goto done;
+ } else {
+ path = strdup(argv[0]);
+ if (path == NULL) {
+ error = got_error_from_errno();
+ goto done;
+ }
+ }
+ } else
+ usage_log();
+
+ repo_path = worktree ?
+ strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
+ if (repo_path == NULL) {
+ error = got_error_from_errno();
+ goto done;
}
init_curses();