Commit Diff

Commit:
6efaaa2dc11f89afcaa5a87df73fbcb123c66729
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
port fix for a work tree path bug from 'tog blame' to 'got blame'
Actions:
Patch | Tree
commit - eb41ed7524c8a5986f7b41cebc0f34d669b6e090
commit + 6efaaa2dc11f89afcaa5a87df73fbcb123c66729
blob - 549e47463e307df7d26495546ea2df98910f0ae7
blob + d7e55d3b7bbc5195d9c895b68af79a5dd25b7e1e
--- got/got.c
+++ got/got.c
@@ -1142,15 +1142,17 @@ cmd_blame(int argc, char *argv[])
 		goto done;
 
 	if (worktree) {
+		const char *prefix = got_worktree_get_path_prefix(worktree);
 		char *p, *worktree_subdir = cwd +
 		    strlen(got_worktree_get_root_path(worktree));
-		if (asprintf(&p, "%s/%s/%s",
-		    got_worktree_get_path_prefix(worktree),
-		    worktree_subdir, path) == -1) {
+		if (asprintf(&p, "%s%s%s%s%s",
+		    prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
+		    worktree_subdir, worktree_subdir[0] ? "/" : "",
+		    path) == -1) {
 			error = got_error_from_errno();
 			goto done;
 		}
-		error = got_repo_map_path(&in_repo_path, repo, p, 1);
+		error = got_repo_map_path(&in_repo_path, repo, p, 0);
 		free(p);
 	} else {
 		error = got_repo_map_path(&in_repo_path, repo, path, 1);