commit c88eb298659dd382406fb947a26d767c08acfebd from: Stefan Sperling date: Sun Mar 11 12:15:49 2018 UTC rename worktree_root to root_path in struct worktree commit - cde76477d633de6791ecd9eb2be7ef127daa8f4f commit + c88eb298659dd382406fb947a26d767c08acfebd blob - e569004fb798a0080e811e4b75bce6f4df3e179b blob + 8646f35a6980e076df57e4bae034c5be6d66628e --- lib/got_worktree_priv.h +++ lib/got_worktree_priv.h @@ -15,7 +15,7 @@ */ struct got_worktree { - char *worktree_root; + char *root_path; char *repo_path; char *path_prefix; char *base_commit; blob - 7b501c8c62693a4627a66d8b1e8946ead2b523bb blob + 1545acde06e4af06f140b6a1ebdb4b1d0a7ae185 --- lib/worktree.c +++ lib/worktree.c @@ -276,8 +276,8 @@ got_worktree_open(struct got_worktree **worktree, cons } (*worktree)->lockfd = -1; - (*worktree)->worktree_root = strdup(path); - if ((*worktree)->worktree_root == NULL) { + (*worktree)->root_path = strdup(path); + if ((*worktree)->root_path == NULL) { err = got_error(GOT_ERR_NO_MEM); goto done; } @@ -318,7 +318,7 @@ done: void got_worktree_close(struct got_worktree *worktree) { - free(worktree->worktree_root); + free(worktree->root_path); free(worktree->repo_path); free(worktree->path_prefix); free(worktree->base_commit);