diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:14:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:14:32 +0900 |
| commit | 905f16dd02bb15e0c1e12bf1a6c28510f504f441 (patch) | |
| tree | 30ca8d7c2c929bf8bd57d4a853e4c92e74ae1ddb /builtin/commit.c | |
| parent | 093048b22913be23fe45635e8723d3aa3a185ff3 (diff) | |
| parent | 4da72644b768b0491110a8ba0aa84d32b6bde41c (diff) | |
| download | git-905f16dd02bb15e0c1e12bf1a6c28510f504f441.tar.gz git-905f16dd02bb15e0c1e12bf1a6c28510f504f441.tar.xz | |
Merge branch 'ma/reduce-heads-leakfix'
Leak fixes.
* ma/reduce-heads-leakfix:
reduce_heads: fix memory leaks
builtin/merge-base: free commit lists
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index cfb78fcf6..8a8770141 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1750,7 +1750,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) allow_fast_forward = 0; } if (allow_fast_forward) - parents = reduce_heads(parents); + reduce_heads_replace(&parents); } else { if (!reflog_msg) reflog_msg = (whence == FROM_CHERRY_PICK) |