summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-15 12:54:50 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-15 15:23:31 -0700
commitfea33a1ef37a5891ebd1fcf6018849150e7b91cb (patch)
treee9c355fd5d93b3977be742c201b21797d033b855 /commit.h
parent4e3aa87d13b339fa678cd3cb7f23664d3a48fb21 (diff)
downloadgit-fea33a1ef37a5891ebd1fcf6018849150e7b91cb.tar.gz
Declare lookup_replace_object() in cache.h, not in commit.h
The declaration is misplaced as the replace API is supposed to affect not just commits, but all types of objects. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/commit.h b/commit.h
index b3c3bb70c5..f251e75a5b 100644
--- a/commit.h
+++ b/commit.h
@@ -145,8 +145,6 @@ 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);
-const unsigned char *lookup_replace_object(const unsigned char *sha1);
-
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);