mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 00:46:11 +02:00
Code

Merge branch 'rs/pull-leakfix' 

Leakfix.

* rs/pull-leakfix:
  pull: plug minor memory leak after using is_descendant_of()
This commit is contained in:
Junio C Hamano 2020-06-29 14:17:26 -07:00
parent 610486749a 0c9a4f638a
commit b381c98891
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/pull.c
View File

@ -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);