From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 13 Apr 2022 20:01:31 +0000 (+0200)
Subject: blame: use "goto cleanup" for cleanup_scoreboard()
X-Git-Tag: v2.37.0-rc0~26^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b59b2db97af0b40fc2688069c3a91ba28f8883d;p=thirdparty%2Fgit.git

blame: use "goto cleanup" for cleanup_scoreboard()

Amend a freeing pattern added in 0906ac2b54b (blame: use changed-path
Bloom filters, 2020-04-16) to use a "goto cleanup", so that we can be
sure that we call cleanup_scoreboard().

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/blame.c b/builtin/blame.c
index 8d15b68afc..885b381ab8 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1167,7 +1167,7 @@ parse_done:
 	if (!incremental)
 		setup_pager();
 	else
-		return 0;
+		goto cleanup;
 
 	blame_sort_final(&sb);
 
@@ -1201,6 +1201,7 @@ parse_done:
 		printf("num commits: %d\n", sb.num_commits);
 	}
 
+cleanup:
 	cleanup_scoreboard(&sb);
 	return 0;
 }