From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Jul 2020 05:09:15 +0000 (-0700)
Subject: Merge branch 'cb/is-descendant-of'
X-Git-Tag: v2.28.0-rc0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0258ed1e08e7973f1d6829db8d33109851067a91;p=thirdparty%2Fgit.git

Merge branch 'cb/is-descendant-of'

Code clean-up.

* cb/is-descendant-of:
  commit-reach: avoid is_descendant_of() shim
---

0258ed1e08e7973f1d6829db8d33109851067a91
diff --cc commit-reach.c
index a7a0b87263,2d85265a35..efd5925cbb
--- a/commit-reach.c
+++ b/commit-reach.c
@@@ -439,9 -427,8 +434,10 @@@ int ref_newer(const struct object_id *n
  		return 0;
  
  	commit_list_insert(old_commit, &old_commit_list);
- 	ret = is_descendant_of(new_commit, old_commit_list);
 -	return repo_is_descendant_of(the_repository,
++	ret = repo_is_descendant_of(the_repository,
+ 				    new_commit, old_commit_list);
 +	free_commit_list(old_commit_list);
 +	return ret;
  }
  
  /*