diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:06 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:07 +0900 |
| commit | ceb7a01aac907f124ca9bc0d768336e7c0aaa944 (patch) | |
| tree | 572653023abd76faf00323f0862a6054a6f319e8 /builtin | |
| parent | Merge branch 'jk/write-in-full-fix' (diff) | |
| parent | replace-objects: evaluate replacement refs without using the object store (diff) | |
| download | git-ceb7a01aac907f124ca9bc0d768336e7c0aaa944.tar.gz git-ceb7a01aac907f124ca9bc0d768336e7c0aaa944.zip | |
Merge branch 'jn/per-repo-object-store-fixes'
Step #0 of a planned & larger series to make the in-core object
store per in-core repository object.
* jn/per-repo-object-store-fixes:
replace-objects: evaluate replacement refs without using the object store
push, fetch: error out for submodule entries not pointing to commits
pack: make packed_git_mru global a value instead of a pointer
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pack-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index a57b4f058d..f721137eaf 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1012,7 +1012,7 @@ static int want_object_in_pack(const unsigned char *sha1, return want; } - for (entry = packed_git_mru->head; entry; entry = entry->next) { + for (entry = packed_git_mru.head; entry; entry = entry->next) { struct packed_git *p = entry->item; off_t offset; @@ -1030,7 +1030,7 @@ static int want_object_in_pack(const unsigned char *sha1, } want = want_found_object(exclude, p); if (!exclude && want > 0) - mru_mark(packed_git_mru, entry); + mru_mark(&packed_git_mru, entry); if (want != -1) return want; } |