diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-15 12:54:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-15 15:23:31 -0700 |
commit | fea33a1ef37a5891ebd1fcf6018849150e7b91cb (patch) | |
tree | e9c355fd5d93b3977be742c201b21797d033b855 | |
parent | Update draft release notes to 1.7.6 (diff) | |
download | tgif-fea33a1ef37a5891ebd1fcf6018849150e7b91cb.tar.xz |
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>
-rw-r--r-- | cache.h | 1 | ||||
-rw-r--r-- | commit.h | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -763,6 +763,7 @@ static inline void *read_sha1_file(const unsigned char *sha1, enum object_type * { return read_sha1_file_repl(sha1, type, size, NULL); } +extern const unsigned char *lookup_replace_object(const unsigned char *sha1); extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1); extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1); extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *); @@ -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); |