From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jun 2020 21:17:26 +0000 (-0700)
Subject: Merge branch 'rs/pull-leakfix'
X-Git-Tag: v2.28.0-rc0~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b381c98891c90c198b247b970bae783123226cad;p=thirdparty%2Fgit.git

Merge branch 'rs/pull-leakfix'

Leakfix.

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

b381c98891c90c198b247b970bae783123226cad
diff --cc builtin/pull.c
index 00e5857a8d,06e5bd48b5..8e6572d305
--- a/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))