mirror of
https://github.com/git/git.git
synced 2025-02-06 09:44:30 +00:00
b81093aeae
Stop using `the_repository` in the "resolve-undo" subsystem by passing in the hash algorithm when reading or writing resolve-undo information. While we could trivially update the caller to pass in the hash algorithm used by the index itself, we instead pass in `the_hash_algo`. This is mostly done to stay consistent with the rest of the code in that file, which isn't prepared to handle arbitrary repositories, either. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
26 lines
746 B
C
26 lines
746 B
C
#ifndef RESOLVE_UNDO_H
|
|
#define RESOLVE_UNDO_H
|
|
|
|
struct cache_entry;
|
|
struct index_state;
|
|
struct pathspec;
|
|
struct string_list;
|
|
|
|
#include "hash.h"
|
|
|
|
struct resolve_undo_info {
|
|
unsigned int mode[3];
|
|
struct object_id oid[3];
|
|
};
|
|
|
|
void record_resolve_undo(struct index_state *, struct cache_entry *);
|
|
void resolve_undo_write(struct strbuf *, struct string_list *,
|
|
const struct git_hash_algo *algop);
|
|
struct string_list *resolve_undo_read(const char *, unsigned long,
|
|
const struct git_hash_algo *algop);
|
|
void resolve_undo_clear_index(struct index_state *);
|
|
int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned);
|
|
void unmerge_index(struct index_state *, const struct pathspec *, unsigned);
|
|
|
|
#endif
|