]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'cb/is-descendant-of'
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Jul 2020 05:09:15 +0000 (22:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Jul 2020 05:09:16 +0000 (22:09 -0700)
Code clean-up.

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

1  2 
builtin/pull.c
commit-reach.c
t/helper/test-reach.c

diff --cc builtin/pull.c
Simple merge
diff --cc commit-reach.c
index a7a0b8726310e1b264db5fc3851e1346d1c29193,2d85265a35061745cb59c6f2d2991f8ae41bd0a7..efd5925cbb826e563c1a2040b506f9d9148d1d18
@@@ -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;
  }
  
  /*
Simple merge