mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-14 21:45:33 +00:00
4c0b6a6dac
New external functions: - git_index_unmerged_entrycount: Counts the unmerged entries in the index - git_index_get_unmerged: Gets an unmerged entry from the index by name New internal functions: - read_unmerged: Wrapper for read_unmerged_internal - read_unmerged_internal: Reads unmerged entries from the index if the index has the INDEX_EXT_UNMERGED_SIG set - unmerged_srch: Search function for unmerged vector - unmerged_cmp: Compare function for unmerged vector New data structures: - git_index now contains a git_vector unmerged that stores unmerged entries - git_index_entry_unmerged: Representation of an unmerged file entry. It represents all three versions of the file at the same time, with one name, three modes and three OIDs
37 lines
574 B
C
37 lines
574 B
C
#ifndef INCLUDE_index_h__
|
|
#define INCLUDE_index_h__
|
|
|
|
#include "fileops.h"
|
|
#include "filebuf.h"
|
|
#include "vector.h"
|
|
#include "git2/odb.h"
|
|
#include "git2/index.h"
|
|
|
|
struct git_index_tree {
|
|
char *name;
|
|
|
|
struct git_index_tree *parent;
|
|
struct git_index_tree **children;
|
|
size_t children_count;
|
|
|
|
size_t entries;
|
|
git_oid oid;
|
|
};
|
|
|
|
typedef struct git_index_tree git_index_tree;
|
|
|
|
struct git_index {
|
|
git_repository *repository;
|
|
char *index_file_path;
|
|
|
|
time_t last_modified;
|
|
git_vector entries;
|
|
|
|
unsigned int on_disk:1;
|
|
git_index_tree *tree;
|
|
|
|
git_vector unmerged;
|
|
};
|
|
|
|
#endif
|