thodg/libgit2/src/annotated_commit.h
Tag
-
Show log
Commit
-
Hash : 76ade3a0
Author :
Date : 2015-11-10T21:21:26
merge: use annotated commits for recursion Use annotated commits to act as our virtual bases, instead of regular commits, to avoid polluting the odb with virtual base commits and trees. Instead, build an annotated commit with an index and pointers to the commits that it was merged from.
-
src/annotated_commit.h
-
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
/* * Copyright (C) the libgit2 contributors. All rights reserved. * * This file is part of libgit2, distributed under the GNU GPL v2 with * a Linking Exception. For full terms see the included COPYING file. */ #ifndef INCLUDE_annotated_commit_h__ #define INCLUDE_annotated_commit_h__ #include "oidarray.h" #include "git2/oid.h" typedef enum { GIT_ANNOTATED_COMMIT_REAL = 1, GIT_ANNOTATED_COMMIT_VIRTUAL = 2, } git_annotated_commit_t; /** * Internal structure for merge inputs. An annotated commit is generally * "real" and backed by an actual commit in the repository, but merge will * internally create "virtual" commits that are in-memory intermediate * commits backed by an index. */ struct git_annotated_commit { git_annotated_commit_t type; /* real commit */ git_commit *commit; git_tree *tree; /* virtual commit structure */ git_index *index; git_array_oid_t parents; char *ref_name; char *remote_url; char id_str[GIT_OID_HEXSZ+1]; }; extern int git_annotated_commit_from_head(git_annotated_commit **out, git_repository *repo); extern int git_annotated_commit_from_commit(git_annotated_commit **out, git_commit *commit); #endif