From 4004d68f99c5f8c4f3a338ca0b2e17fddc55c273 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 24 Mar 2017 08:36:12 +0100 Subject: [PATCH 1/2] blame_git: remove spuriuous goto The recent addition of an error code to `pass_whole_blame` in ff8d2eb15 (blame_git: check return value of object lookup, 2017-03-20) introduced a spurious goto. Remove it. --- src/blame_git.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/blame_git.c b/src/blame_git.c index 735b62d95..6d2f1531f 100644 --- a/src/blame_git.c +++ b/src/blame_git.c @@ -547,7 +547,6 @@ static int pass_blame(git_blame *blame, git_blame__origin *origin, uint32_t opt) if (porigin->blob && origin->blob && !git_oid_cmp(git_blob_id(porigin->blob), git_blob_id(origin->blob))) { error = pass_whole_blame(blame, origin, porigin); - goto finish; origin_decref(porigin); goto finish; } From fbdf2a79d5b6f3f4c9a7abdd971f9f3cb133e157 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 24 Mar 2017 09:26:31 +0100 Subject: [PATCH 2/2] worktree: unconditionally free the worktree's name --- src/worktree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/worktree.c b/src/worktree.c index 393a088fe..55fbf5204 100644 --- a/src/worktree.c +++ b/src/worktree.c @@ -212,8 +212,7 @@ int git_worktree_open_from_repository(git_worktree **out, git_repository *repo) goto out; out: - if (error) - free(name); + free(name); git_buf_free(&parent); return error;