On Sat, Aug 28, 2021 at 11:35:13PM +0200, Christian Weisgerber wrote:
> Stefan Sperling:
> 
> > Thank you for the pack file (sent offlist).
> > 
> > There are two blobs in the generated pack which do not match IDs listed
> > by the add_meta() debug patch. These objects do however contain code that
> > looks like it represents different versions of the relevant files.
> > I don't yet understand how this can happen.
> > 
> > The objects I have found in your pack file are:
> > 
> > histedit.sh b537e75f7e7476cd4f58eb269d7685cfacc659ff
> > rebase.sh cfa90dd4cb1ad9c80395ebf594f2e8c0cdb7a1b0
> > 
> > These objects don't exist in my repositories.
> 
> They don't exist here either.
> 
> $ got cat b537e75f7e7476cd4f58eb269d7685cfacc659ff
> got: b537e75f7e7476cd4f58eb269d7685cfacc659ff: object not found
> $ got cat cfa90dd4cb1ad9c80395ebf594f2e8c0cdb7a1b0
> got: cfa90dd4cb1ad9c80395ebf594f2e8c0cdb7a1b0: object not found
> 
> > For reference, the list below shows the ID's which add_meta() was
> > looking at. Apart from histedit.sh and rebase.sh the IDs of objects
> > shipped in the pack file are the same.
> 
> Those IDs look sensible.  In particular,
> 
> 7de2767444a19ea67be04143f1677a1e6e9a08d7 histedit.sh
> adcd68a54d1b7782e58f25d336933c2a3002a40b rebase.sh
> 
> should be included in the pack file.

Most likely the file contents weren't included in the pack properly.
This would cause their hashes to change.

I've attached the files I found in the pack file.
Can you please diff them against your files?

Note that the SHA1 of these files differs yet again since the blob object
header, which is hashed into the Git object SHA1, is now missing.

• histedit.sh (54K)
• rebase.sh (44K)