diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/builtin/cat-file.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/builtin/cat-file.c')
| -rw-r--r-- | third_party/git/builtin/cat-file.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/git/builtin/cat-file.c b/third_party/git/builtin/cat-file.c index 272f9fc6d7..995d47c85a 100644 --- a/third_party/git/builtin/cat-file.c +++ b/third_party/git/builtin/cat-file.c @@ -15,7 +15,6 @@ #include "sha1-array.h" #include "packfile.h" #include "object-store.h" -#include "promisor-remote.h" struct batch_options { int enabled; @@ -262,7 +261,7 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len, strbuf_addstr(sb, data->rest); } else if (is_atom("deltabase", atom, len)) { if (data->mark_query) - data->info.delta_base_oid = &data->delta_base_oid; + data->info.delta_base_sha1 = data->delta_base_oid.hash; else strbuf_addstr(sb, oid_to_hex(&data->delta_base_oid)); @@ -525,8 +524,8 @@ static int batch_objects(struct batch_options *opt) if (opt->all_objects) { struct object_cb_data cb; - if (has_promisor_remote()) - warning("This repository uses promisor remotes. Some objects may not be loaded."); + if (repository_format_partial_clone) + warning("This repository has extensions.partialClone set. Some objects may not be loaded."); cb.opt = opt; cb.expand = &data; |