aboutsummaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-02 15:11:07 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-02 15:11:07 -0800
commiteadbcd498a18d60467883aeb6c0726048e7382a2 (patch)
tree50e765722a06a56121c6431d47cd319a2594ae71 /commit.h
parentc42f63671c0f09cba0c8247c4d1d8121f37798fe (diff)
parent28f72a0f232dfc71b3be726e7e71d0a6d5f9ebba (diff)
downloadgit-eadbcd498a18d60467883aeb6c0726048e7382a2.tar.gz
git-eadbcd498a18d60467883aeb6c0726048e7382a2.tar.xz
Merge branch 'mk/maint-parse-careful'
* mk/maint-parse-careful: receive-pack: use strict mode for unpacking objects index-pack: introduce checking mode unpack-objects: prevent writing of inconsistent objects unpack-object: cache for non written objects add common fsck error printing function builtin-fsck: move common object checking code to fsck.c builtin-fsck: reports missing parent commits Remove unused object-ref code builtin-fsck: move away from object-refs to fsck_walk add generic, type aware object chain walker Conflicts: Makefile builtin-fsck.c
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 80d65b96d..a1e959142 100644
--- a/commit.h
+++ b/commit.h
@@ -116,6 +116,7 @@ struct commit_graft {
struct commit_graft *read_graft_line(char *buf, int len);
int register_commit_graft(struct commit_graft *, int);
int read_graft_file(const char *graft_file);
+struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);