lisk77/merk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(commit): make object hashes branch aware and thus dont error status out

Browse source
This commit is contained in:
lisk77 2025-11-24 18:21:09 +01:00
parent 42b8858558
commit fae8489871
5 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/file.h
View file

@ -55,7 +55,7 @@ File* slice_file(File*, uint64_t, uint64_t);
File* copy_file(File* original);
int insert_line(File*, char*, size_t);
int delete_line(File*, size_t);
int snapshot_file(char*, char*, size_t, char*);
int snapshot_file(char*, char*, size_t, char*, char*);
void free_file(File*);
FileInfoBuffer* file_info_buffer_new();
int file_info_buffer_push(FileInfoBuffer*, FileInfo);

2
include/object.h
View file

@ -28,7 +28,7 @@
char* get_object(char*, size_t*);
void* parse_object(char*, ObjectType, size_t*, char*);
int save_diff(ActionList*, char*, char*, size_t, char*);
int save_diff(ActionList*, char*, char*, size_t, char*, char*);
int read_diff(char*, char*, ActionList*);
int save_file_diff(char*, char*, size_t, char*, ActionList*);
File* apply_diff(File*, ActionList*);