From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Jan 2018 22:01:25 +0000 (-0800)
Subject: Merge branch 'ma/bisect-leakfix'
X-Git-Tag: v2.16.0-rc2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4cc676c46cf07d0302d36e4aea9ecf847510383e?ds=inline;hp=-c

Merge branch 'ma/bisect-leakfix'

A hotfix for a recent update that broke 'git bisect'.

* ma/bisect-leakfix:
bisect: fix a regression causing a segfault
---

4cc676c46cf07d0302d36e4aea9ecf847510383e
diff --combined bisect.c
index 0fca17c02b,87e4dee16d..2f3008b078
--- a/bisect.c
+++ b/bisect.c
@@@ -229,8 -229,10 +229,10 @@@ static struct commit_list *best_bisecti
  		if (i < cnt - 1)
  			p = p->next;
  	}
- 	free_commit_list(p->next);
- 	p->next = NULL;
+ 	if (p) {
+ 		free_commit_list(p->next);
+ 		p->next = NULL;
+ 	}
  	strbuf_release(&buf);
  	free(array);
  	return list;
@@@ -439,12 -441,7 +441,12 @@@ static int read_bisect_refs(void
  
  static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
  static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
 +static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
 +static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
 +static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
 +static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
  static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
 +static GIT_PATH_FUNC(git_path_head_name, "head-name")
  
  static void read_bisect_paths(struct argv_array *array)
  {
@@@ -696,12 -693,11 +698,12 @@@ static int bisect_checkout(const struc
  	char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
  
  	memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
 -	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev->hash, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
 +	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
  
  	argv_checkout[2] = bisect_rev_hex;
  	if (no_checkout) {
 -		update_ref(NULL, "BISECT_HEAD", bisect_rev->hash, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
 +		update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
 +			   UPDATE_REFS_DIE_ON_ERR);
  	} else {
  		int res;
  		res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
@@@ -1055,40 -1051,3 +1057,40 @@@ int estimate_bisect_steps(int all
  
  	return (e < 3 * x) ? n : n - 1;
  }
 +
 +static int mark_for_removal(const char *refname, const struct object_id *oid,
 +			    int flag, void *cb_data)
 +{
 +	struct string_list *refs = cb_data;
 +	char *ref = xstrfmt("refs/bisect%s", refname);
 +	string_list_append(refs, ref);
 +	return 0;
 +}
 +
 +int bisect_clean_state(void)
 +{
 +	int result = 0;
 +
 +	/* There may be some refs packed during bisection */
 +	struct string_list refs_for_removal = STRING_LIST_INIT_NODUP;
 +	for_each_ref_in("refs/bisect", mark_for_removal, (void *) &refs_for_removal);
 +	string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD"));
 +	result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF);
 +	refs_for_removal.strdup_strings = 1;
 +	string_list_clear(&refs_for_removal, 0);
 +	unlink_or_warn(git_path_bisect_expected_rev());
 +	unlink_or_warn(git_path_bisect_ancestors_ok());
 +	unlink_or_warn(git_path_bisect_log());
 +	unlink_or_warn(git_path_bisect_names());
 +	unlink_or_warn(git_path_bisect_run());
 +	unlink_or_warn(git_path_bisect_terms());
 +	/* Cleanup head-name if it got left by an old version of git-bisect */
 +	unlink_or_warn(git_path_head_name());
 +	/*
 +	 * Cleanup BISECT_START last to support the --no-checkout option
 +	 * introduced in the commit 4796e823a.
 +	 */
 +	unlink_or_warn(git_path_bisect_start());
 +
 +	return result;
 +}