Commit 36fc25572ca042372b1a58f07bc721b2b827e8be

Carlos Martín Nieto 2016-04-01T04:09:50

Merge pull request #3720 from pks-t/pks/merge-driver-memleaks merge_driver: fix missing `goto done;`

1
2
3
4
5
6
7
8
9
10
11
12
diff --git a/src/merge_driver.c b/src/merge_driver.c
index cc039db..88a53ec 100644
--- a/src/merge_driver.c
+++ b/src/merge_driver.c
@@ -178,6 +178,7 @@ int git_merge_driver_global_init(void)
 			merge_driver_name__union, &git_merge_driver__union.base)) < 0 ||
 		(error = merge_driver_registry_insert(
 			merge_driver_name__binary, &git_merge_driver__binary)) < 0)
+		goto done;
 
 	git__on_shutdown(git_merge_driver_global_shutdown);