diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-06-29 21:17:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-29 21:17:26 (GMT) |
| commit | b381c98891c90c198b247b970bae783123226cad (patch) | |
| tree | f7df277c7cd1de90eea7f319b4c501dc2f5a6d6a /builtin/pull.c | |
| parent | 610486749aca4ce9e5923baa70b072eff69a9867 (diff) | |
| parent | 0c9a4f638a53c4b54d5bf91e179d5d915e698272 (diff) | |
| download | git-b381c98891c90c198b247b970bae783123226cad.zip git-b381c98891c90c198b247b970bae783123226cad.tar.gz git-b381c98891c90c198b247b970bae783123226cad.tar.bz2 | |
Merge branch 'rs/pull-leakfix'
Leakfix.
* rs/pull-leakfix:
pull: plug minor memory leak after using is_descendant_of()
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 00e5857..8e6572d 100644 --- 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); |