From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 1/5] Declare lookup_replace_object() in cache.h, not in commit.h
Date: Sun, 15 May 2011 12:54:50 -0700 [thread overview]
Message-ID: <1305489294-14341-2-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1305489294-14341-1-git-send-email-gitster@pobox.com>
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>
---
cache.h | 1 +
commit.h | 2 --
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index 2b34116..e09cf75 100644
--- a/cache.h
+++ b/cache.h
@@ -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 *);
diff --git a/commit.h b/commit.h
index b3c3bb7..f251e75 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);
--
1.7.5.1.334.gdfd07
next prev parent reply other threads:[~2011-05-15 19:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-15 19:54 [PATCH 0/5] Updates to replace-object API Junio C Hamano
2011-05-15 19:54 ` Junio C Hamano [this message]
2011-05-15 19:54 ` [PATCH 2/5] t6050: make sure we test not just commit replacement Junio C Hamano
2011-05-15 19:54 ` [PATCH 3/5] read_sha1_file(): get rid of read_sha1_file_repl() madness Junio C Hamano
2011-05-15 19:54 ` [PATCH 4/5] inline lookup_replace_object() calls Junio C Hamano
2011-05-15 19:54 ` [PATCH 5/5] read_sha1_file(): allow selective bypassing of replacement mechanism Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1305489294-14341-2-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).