Commit 1a1242a9a15f34878343aebfb28a71e0c5d9b904
2021-04-01T19:28:57
diff: reduce duplicate code Condense error checking to reduce a future diff moving those lines around; this pattern is already used in other parts of the tree. fine stsp ok tracey
diff --git a/got/got.c b/got/got.c
index 5d1639c..192b847 100644
--- a/got/got.c
+++ b/got/got.c
@@ -4381,19 +4381,11 @@ cmd_diff(int argc, char *argv[])
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));
- if (repo_path == NULL) {
- error = got_error_from_errno("strdup");
- goto done;
- }
- } else {
- repo_path = strdup(cwd);
- if (repo_path == NULL) {
- error = got_error_from_errno("strdup");
- goto done;
- }
+ repo_path = strdup(worktree ?
+ got_worktree_get_repo_path(worktree) : cwd);
+ if (repo_path == NULL) {
+ error = got_error_from_errno("strdup");
+ goto done;
}
}
} else