diff options
Diffstat (limited to 'diffcore-break.c')
| -rw-r--r-- | diffcore-break.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/diffcore-break.c b/diffcore-break.c index 0d4a14964d..02735f80c6 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -1,9 +1,13 @@ /* * Copyright (C) 2005 Junio C Hamano */ -#include "cache.h" -#include "diff.h" + +#define USE_THE_REPOSITORY_VARIABLE + +#include "git-compat-util.h" #include "diffcore.h" +#include "hash.h" +#include "object.h" #include "promisor-remote.h" static int should_break(struct repository *r, @@ -65,7 +69,7 @@ static int should_break(struct repository *r, oideq(&src->oid, &dst->oid)) return 0; /* they are the same */ - if (r == the_repository && has_promisor_remote()) { + if (r == the_repository && repo_has_promisor_remote(the_repository)) { options.missing_object_cb = diff_queued_diff_prefetch; options.missing_object_data = r; } @@ -262,8 +266,8 @@ static void merge_broken(struct diff_filepair *p, * in the resulting tree. */ d->one->rename_used++; - diff_free_filespec_data(d->two); - diff_free_filespec_data(c->one); + free_filespec(d->two); + free_filespec(c->one); free(d); free(c); } |