From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Aug 2017 17:20:03 +0000 (-0700)
Subject: Merge branch 'rs/commit-h-single-parent-cleanup'
X-Git-Tag: v2.15.0-rc0~133
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/985b2cfc7b71cdaf842832afe3914e25a80dde25?ds=inline;hp=-c

Merge branch 'rs/commit-h-single-parent-cleanup'

Code clean-up.

* rs/commit-h-single-parent-cleanup:
commit: remove unused inline function single_parent()
---

985b2cfc7b71cdaf842832afe3914e25a80dde25
diff --combined commit.h
index 6d857f06c1,f3805fec6b..1283d2a51f
--- a/commit.h
+++ b/commit.h
@@@ -249,7 -249,7 +249,7 @@@ typedef int (*each_commit_graft_fn)(con
  
  struct commit_graft *read_graft_line(char *buf, int len);
  int register_commit_graft(struct commit_graft *, int);
 -struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
 +struct commit_graft *lookup_commit_graft(const struct object_id *oid);
  
  extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
  extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
@@@ -313,11 -313,6 +313,6 @@@ extern int interactive_add(int argc, co
  extern int run_add_interactive(const char *revision, const char *patch_mode,
  			       const struct pathspec *pathspec);
  
- static inline int single_parent(struct commit *commit)
- {
- 	return commit->parents && !commit->parents->next;
- }
- 
  struct commit_list *reduce_heads(struct commit_list *heads);
  
  struct commit_extra_header {