Revision 9b8f7b8c5a6098653a0b616a36feb0dc2216a994 authored by Elijah Newren on 14 May 2020, 05:24:20 UTC, committed by Elijah Newren on 14 May 2020, 16:38:56 UTC
commit b0a5a12a60 ("unpack-trees: allow check_updates() to work on a different index", 2020-03-27) allowed check_updates() to work on a different index, but it called get_progress() which was hardcoded to work on o->result much like check_updates() had been. Update it to also accept an index parameter and have check_updates() pass that parameter along so that both are working on the same index. Noticed-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Elijah Newren <newren@gmail.com>
1 parent b994622
merge-blobs.h
#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H
struct blob;
struct index_state;
void *merge_blobs(struct index_state *, const char *,
struct blob *, struct blob *,
struct blob *, unsigned long *);
#endif /* MERGE_BLOBS_H */
Computing file changes ...