Merge branch 'rs/pull-leakfix'

gitster · gitster · commit b381c98891c9 · 2020-06-29T14:17:26.000-07:00
Leakfix.

* rs/pull-leakfix:
  pull: plug minor memory leak after using is_descendant_of()
diff --git a/builtin/pull.c b/builtin/pull.c
@@ -1031,6 +1031,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 				ran_ff = 1;
 				ret = run_merge();
 			}
+			free_commit_list(list);
 		}
 		if (!ran_ff)
 			ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);

Original file line number	Diff line number	Diff line change
`@@ -1031,6 +1031,7 @@ int cmd_pull(int argc, const char *argv, const char prefix)`
`1031`	`1031`	`ran_ff = 1;`
`1032`	`1032`	`ret = run_merge();`
`1033`	`1033`	`}`
	`1034`	`+ free_commit_list(list);`
`1034`	`1035`	`}`
`1035`	`1036`	`if (!ran_ff)`
`1036`	`1037`	`ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);`