Merge branch 'rs/pull-leakfix'

Leakfix.

* rs/pull-leakfix:
  pull: plug minor memory leak after using is_descendant_of()

diff --cc builtin/pull.c
index 00e5857a8d18da3394d6e5a3316e8f56bb98fdb5,06e5bd48b55623888706a0c41dd38162eb38230e..8e6572d305ec3fac23af491a14e1a9612bedba64
--- 1/builtin/pull.c
--- 2/builtin/pull.c
+++ b/builtin/pull.c
@@@ -1028,12 -992,11 +1028,13 @@@ int cmd_pull(int argc, const char **arg
                        if (is_descendant_of(merge_head, list)) {
                                /* we can fast-forward this without invoking rebase */
                                opt_ff = "--ff-only";
 +                              ran_ff = 1;
                                ret = run_merge();
                        }
+                       free_commit_list(list);
                }
 -              ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
 +              if (!ran_ff)
 +                      ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
  
                if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
                             recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))