diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2021-02-22 20:20:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-22 21:07:40 +0100 |
| commit | 5476e1efded571e374cd97c7d69f17962ba1c44f (patch) | |
| tree | 89b90c60cb783a579dfc10e045adb1499d47ece0 /pack.h | |
| parent | fetch-pack: with packfile URIs, use index-pack arg (diff) | |
| download | git-5476e1efded571e374cd97c7d69f17962ba1c44f.tar.xz git-5476e1efded571e374cd97c7d69f17962ba1c44f.zip | |
fetch-pack: print and use dangling .gitmodules
Teach index-pack to print dangling .gitmodules links after its "keep" or
"pack" line instead of declaring an error, and teach fetch-pack to check
such lines printed.
This allows the tree side of the .gitmodules link to be in one packfile
and the blob side to be in another without failing the fsck check,
because it is now fetch-pack which checks such objects after all
packfiles have been downloaded and indexed (and not index-pack on an
individual packfile, as it is before this commit).
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack.h')
| -rw-r--r-- | pack.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -85,7 +85,7 @@ int verify_pack_index(struct packed_git *); int verify_pack(struct repository *, struct packed_git *, verify_fn fn, struct progress *, uint32_t); off_t write_pack_header(struct hashfile *f, uint32_t); void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t, unsigned char *, off_t); -char *index_pack_lockfile(int fd); +char *index_pack_lockfile(int fd, int *is_well_formed); /* * The "hdr" output buffer should be at least this big, which will handle sizes |