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/shallow.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/shallow.c')
| -rw-r--r-- | third_party/git/shallow.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/git/shallow.c b/third_party/git/shallow.c index 7fd04afed1..5fa2b15d37 100644 --- a/third_party/git/shallow.c +++ b/third_party/git/shallow.c @@ -12,7 +12,10 @@ #include "diff.h" #include "revision.h" #include "commit-slab.h" +#include "revision.h" #include "list-objects.h" +#include "commit-slab.h" +#include "repository.h" #include "commit-reach.h" void set_alternate_shallow_file(struct repository *r, const char *path, int override) @@ -153,8 +156,6 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, for (i = 0; i < depths.slab_count; i++) { int j; - if (!depths.slab[i]) - continue; for (j = 0; j < depths.slab_size; j++) free(depths.slab[i][j]); } |