Merge branch 'rs/pull-leakfix' into jch

Leakfix.

* rs/pull-leakfix:
  pull: plug minor memory leak after using is_descendant_of()
This commit is contained in:
Junio C Hamano
2020-06-19 14:52:26 -07:00

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