diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:15:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:15:59 +0900 |
| commit | 6d8f8ebb74d21b51cfbf427a436094134af36ee2 (patch) | |
| tree | 0b50647db06413e2f43487b2bfca167105b7f701 /upload-pack.c | |
| parent | Merge branch 'ab/commit-graph-progress' (diff) | |
| parent | commit-graph: close_commit_graph before shallow walk (diff) | |
| download | tgif-6d8f8ebb74d21b51cfbf427a436094134af36ee2.tar.xz | |
Merge branch 'ds/commit-graph-with-grafts'
The recently introduced commit-graph auxiliary data is incompatible
with mechanisms such as replace & grafts that "breaks" immutable
nature of the object reference relationship. Disable optimizations
based on its use (and updating existing commit-graph) when these
incompatible features are in use in the repository.
* ds/commit-graph-with-grafts:
commit-graph: close_commit_graph before shallow walk
commit-graph: not compatible with uninitialized repo
commit-graph: not compatible with grafts
commit-graph: not compatible with replace objects
test-repository: properly init repo
commit-graph: update design document
refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
refs.c: migrate internal ref iteration to pass thru repository argument
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/upload-pack.c b/upload-pack.c index 62a1000f44..540778d1dd 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -24,6 +24,7 @@ #include "quote.h" #include "upload-pack.h" #include "serve.h" +#include "commit-graph.h" #include "commit-reach.h" /* Remember to update object flag allocation in object.h */ @@ -692,6 +693,7 @@ static void deepen_by_rev_list(int ac, const char **av, { struct commit_list *result; + close_commit_graph(the_repository); result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); send_shallow(result); free_commit_list(result); |