https-github-com-bit
diff --git a/‎builtin/merge.c‎
Lines changed: 2 additions & 0 deletions b/‎builtin/merge.c‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎t/t7604-merge-custom-message.sh‎
Lines changed: 1 addition & 0 deletions b/‎t/t7604-merge-custom-message.sh‎
Lines changed: 1 addition & 0 deletions
@@ -1576,6 +1576,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
 		finish(head_commit, remoteheads, &commit->object.oid, msg.buf);
 		remove_merge_branch_state(the_repository);
+		strbuf_release(&msg);
 		goto done;
 	} else if (!remoteheads->next && common->next)
 		;
@@ -1746,6 +1747,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		ret = suggest_conflicts();
 
 done:
+	strbuf_release(&buf);
 	free(branch_to_free);
 	return ret;
 }
@@ -4,6 +4,7 @@ test_description='git merge
 
 Testing merge when using a custom message for the merge commit.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 create_merge_msgs() {
Original file line number	Diff line number	Diff line change
`@@ -1576,6 +1576,7 @@ int cmd_merge(int argc, const char *argv, const char prefix)`
`1576`	`1576`
`1577`	`1577`	`finish(head_commit, remoteheads, &commit->object.oid, msg.buf);`
`1578`	`1578`	`remove_merge_branch_state(the_repository);`
	`1579`	`+ strbuf_release(&msg);`
`1579`	`1580`	`goto done;`
`1580`	`1581`	`} else if (!remoteheads->next && common->next)`
`1581`	`1582`	`;`
`@@ -1746,6 +1747,7 @@ int cmd_merge(int argc, const char *argv, const char prefix)`
`1746`	`1747`	`ret = suggest_conflicts();`
`1747`	`1748`
`1748`	`1749`	`done:`
	`1750`	`+ strbuf_release(&buf);`
`1749`	`1751`	`free(branch_to_free);`
`1750`	`1752`	`return ret;`
`1751`	`1753`	`}`