Git v2.40.0 crashing with "could not read index: invalid data in index - calculated checksum does not match expected" #894

mlanln · 2023-04-11T03:07:21Z

Description of the bug

I am trying out git-branchless in a repo at work. git sl works fine but write commands like git record, git amend, and git reword crash.

Expected behavior

No error

Actual behavior

Error

$ git record -m test
The application panicked (crashed).
Message:  A fatal error occurred: 
   0: could not read index: invalid data in index - calculated checksum does not match expected; class=Index (10)
   1: invalid data in index - calculated checksum does not match expected; class=Index (10)

Location:
   /home/mlanln/.cargo/registry/src/github.com-1ecc6299db9ec823/git-branchless-record-0.7.0/src/lib.rs:92

Backtrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
Location: /home/mlanln/.cargo/registry/src/github.com-1ecc6299db9ec823/git-branchless-0.7.0/src/commands/mod.rs:217

Backtrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.

Version of `rustc`

rustc 1.65.0

Automated bug report

Software version

git-branchless 0.7.0

Operating system

Linux 5.15.0-1031-gcp

Command-line

/home/mlanln/.cargo/bin/git-branchless bug-report

Environment variables

SHELL=/bin/bash
EDITOR='code -w'

Git version

> git version 
git version 2.40.0

Hooks

Show 7 hooks

Hook `post-applypatch`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-applypatch "$@"

## END BRANCHLESS CONFIG

Hook `post-checkout`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-checkout "$@"

## END BRANCHLESS CONFIG

Hook `post-commit`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-commit "$@"

## END BRANCHLESS CONFIG

Hook `post-merge`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-merge "$@"

## END BRANCHLESS CONFIG

Hook `post-rewrite`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-rewrite "$@"

## END BRANCHLESS CONFIG

Hook `pre-auto-gc`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook pre-auto-gc "$@"

## END BRANCHLESS CONFIG

Hook `reference-transaction`

#!/bin/sh
## START BRANCHLESS CONFIG

# Avoid canceling the reference transaction in the case that `branchless` fails
# for whatever reason.
git branchless hook reference-transaction "$@" || (
echo 'branchless: Failed to process reference transaction!'
echo 'branchless: Some events (e.g. branch updates) may have been lost.'
echo 'branchless: This is a bug. Please report it.'
)

## END BRANCHLESS CONFIG

Events

Show 5 events

Event ID: 24, transaction ID: 21 (message: hook-post-checkout)

RefUpdateEvent { timestamp: 1681181943.1674395, event_tx_id: EventTransactionId(21), ref_name: ReferenceName("HEAD"), old_oid: 3900bee7374c2fa4318d0b30056db8ac147c0408, new_oid: 3900bee7374c2fa4318d0b30056db8ac147c0408, message: None }

:
O b227894 14d (main, redacted-ref-0) xxx xxxxxxx xx xxxxxxxxx xxxxxxx xxxxxxxxxx xxxxxx
|
@ 3900bee 4h (redacted-ref-1, redacted-ref-2) xxxxxxx xxxxxx xxx xxxxxxxxxx xxxxx xxxxxxxxxx

Event ID: 23, transaction ID: 20 (message: reference-transaction)

RefUpdateEvent { timestamp: 1681181943.1404214, event_tx_id: EventTransactionId(20), ref_name: ReferenceName("refs/heads/redacted-ref-1"), old_oid: 0000000000000000000000000000000000000000, new_oid: 3900bee7374c2fa4318d0b30056db8ac147c0408, message: None }

:
O b227894 14d (main, redacted-ref-0) xxx xxxxxxx xx xxxxxxxxx xxxxxxx xxxxxxxxxx xxxxxx
|
@ 3900bee 4h (redacted-ref-1, redacted-ref-2) xxxxxxx xxxxxx xxx xxxxxxxxxx xxxxx xxxxxxxxxx

Event ID: 22, transaction ID: 19 (message: hook-post-rewrite)

RewriteEvent { timestamp: 1681164709.6778862, event_tx_id: EventTransactionId(19), old_commit_oid: 89b215533a6ef3787065f6471f7b6ceacd6de0e8, new_commit_oid: 3900bee7374c2fa4318d0b30056db8ac147c0408 }

:
O b227894 14d (main, redacted-ref-0) xxx xxxxxxx xx xxxxxxxxx xxxxxxx xxxxxxxxxx xxxxxx
|
@ 3900bee 4h (redacted-ref-1, redacted-ref-2) xxxxxxx xxxxxx xxx xxxxxxxxxx xxxxx xxxxxxxxxx

Event ID: 21, transaction ID: 18 (message: post-commit)

CommitEvent { timestamp: 1681164705.0, event_tx_id: EventTransactionId(18), commit_oid: NonZeroOid(3900bee7374c2fa4318d0b30056db8ac147c0408) }

:
O b227894 14d (main, redacted-ref-0) xxx xxxxxxx xx xxxxxxxxx xxxxxxx xxxxxxxxxx xxxxxx
|
@ 3900bee 4h (redacted-ref-1, redacted-ref-2) xxxxxxx xxxxxx xxx xxxxxxxxxx xxxxx xxxxxxxxxx

Event ID: 19, transaction ID: 17 (message: reference-transaction)

RefUpdateEvent { timestamp: 1681164709.6239216, event_tx_id: EventTransactionId(17), ref_name: ReferenceName("HEAD"), old_oid: 89b215533a6ef3787065f6471f7b6ceacd6de0e8, new_oid: 3900bee7374c2fa4318d0b30056db8ac147c0408, message: None }
RefUpdateEvent { timestamp: 1681164709.6239216, event_tx_id: EventTransactionId(17), ref_name: ReferenceName("refs/heads/redacted-ref-2"), old_oid: 89b215533a6ef3787065f6471f7b6ceacd6de0e8, new_oid: 3900bee7374c2fa4318d0b30056db8ac147c0408, message: None }

:
O b227894 14d (main, redacted-ref-0) xxx xxxxxxx xx xxxxxxxxx xxxxxxx xxxxxxxxxx xxxxxx
|
@ 3900bee 4h (redacted-ref-1, redacted-ref-2) xxxxxxx xxxxxx xxx xxxxxxxxxx xxxxx xxxxxxxxxx

Version of `git-branchless`

No response

Version of `git`

No response

The text was updated successfully, but these errors were encountered:

arxanas · 2023-04-14T01:45:34Z

Hi @mlanln, sorry to hear that this is happening. Another user also reported this on Discord, but unfortunately we were unable to find a solution; they ended up recloning the repo. My assumption is that this is a bug in libgit2, but I'm not sure.

mlanln · 2023-04-14T06:57:10Z

Darn, I was hoping it was fixable. I get the same error on a newly git inited repo so recloning doesn't change anything.

arxanas · 2023-04-14T07:16:00Z

@mlanln can you try with a version of Git earlier than 2.40? Maybe something about the index format changed and libgit2 hasn't upgraded to handle it yet.

mlanln · 2023-04-14T08:18:44Z

Bingo! I downgraded to git version 2.39.2 and all of those commands are working now. Thanks!!

arxanas · 2023-04-14T19:28:53Z

@mlanln Thanks for confirming. I'll leave the issue open in case others run into the same problem. I also very recently updated our version of git2 (in f25babf); if you have time, could you try with that version of the code and see if the problem still occurs with Git v2.40? (See Manual testing.)

auscompgeek · 2023-04-17T07:04:33Z

I'm still seeing this error with git v2.40.0 with f25babf. Here's me trying to git move -b my-branch:

Attempting rebase in-memory...
The application panicked (crashed).
Message:  A fatal error occurred:
   0: could not cherry-pick commit 7e930e0adb6ab058e10d7ddad87a5733ada76400 onto 273ed0e27fa37375a066e047916432f76e430ae2: invalid data in index - calculated checksum does not match expected; class=Index (10)
   1: invalid data in index - calculated checksum does not match expected; class=Index (10)

Location:
   /rustc/9eb3afe9ebe9c7d2b84b71002d44f4a0edac95e0/library/core/src/convert/mod.rs:726

Backtrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
Location: git-branchless/src/commands/mod.rs:221

arxanas · 2023-04-18T02:15:01Z

It looks like it's this issue in libgit2: libgit2/libgit2#6531

You can follow the workaround here:

workaround is to disable the offending option git config --local index.skipHash false. then you have to clear your index and restage all your changes so that the index gets built with the option disabled.

I expect we'll have to wait for libgit2 to fix it and for the changes to propagate downstream.

chriskrycho · 2023-07-12T17:36:42Z

Bonus note: you may not be setting index.skipHash directly. If you set feature.manyFiles = true, that will have the same effect (it implicitly enables index.skipHash, I believe).

halostatue · 2024-02-20T15:24:07Z

This has been fixed in libgit2/libgit2#6738, so it should be in the next release of libgit2 (1.7.3 or later).

robinst · 2024-04-09T02:49:24Z

Looks like the fix for this was released with libgit2 v1.8.0 (released 3 weeks ago): https://github.com/libgit2/libgit2/releases/tag/v1.8.0

Now this is blocked on the rust bindings:

libgit2: Bump to v1.8.1 rust-lang/git2-rs#1032

mlanln added the bug Something isn't working label Apr 11, 2023

mlanln closed this as completed Apr 14, 2023

arxanas changed the title ~~git record/amend/reword crashing with "could not read index: invalid data in index - calculated checksum does not match expected"~~ Git v2.40.0 crashing with "could not read index: invalid data in index - calculated checksum does not match expected" Apr 14, 2023

arxanas reopened this Apr 14, 2023

arxanas added the has-workaround label Apr 18, 2023

arxanas added the no-planned-fix I don't plan to work on this. Feel free to ask if there's an update, or try fixing it yourself. label Apr 25, 2023

1024bees mentioned this issue May 14, 2023

allow git to be not managed by fleek ublue-os/fleek#200

Closed

arxanas mentioned this issue Aug 27, 2023

git sync panic with Unexpected git2 error gitext-rs/git-stack#318

Open

2 tasks

Liam-Breen mentioned this issue Mar 14, 2024

tree view is unusably slow on a large monorepo zed-industries/zed#8242

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Git v2.40.0 crashing with "could not read index: invalid data in index - calculated checksum does not match expected" #894

Git v2.40.0 crashing with "could not read index: invalid data in index - calculated checksum does not match expected" #894

mlanln commented Apr 11, 2023

Hook `post-applypatch`

Hook `post-checkout`

Hook `post-commit`

Hook `post-merge`

Hook `post-rewrite`

Hook `pre-auto-gc`

Hook `reference-transaction`

Event ID: 24, transaction ID: 21 (message: hook-post-checkout)

Event ID: 23, transaction ID: 20 (message: reference-transaction)

Event ID: 22, transaction ID: 19 (message: hook-post-rewrite)

Event ID: 21, transaction ID: 18 (message: post-commit)

Event ID: 19, transaction ID: 17 (message: reference-transaction)

arxanas commented Apr 14, 2023

mlanln commented Apr 14, 2023

arxanas commented Apr 14, 2023

mlanln commented Apr 14, 2023

arxanas commented Apr 14, 2023

auscompgeek commented Apr 17, 2023 •

edited

arxanas commented Apr 18, 2023

chriskrycho commented Jul 12, 2023

halostatue commented Feb 20, 2024

robinst commented Apr 9, 2024

Git v2.40.0 crashing with "could not read index: invalid data in index - calculated checksum does not match expected" #894

Git v2.40.0 crashing with "could not read index: invalid data in index - calculated checksum does not match expected" #894

Comments

mlanln commented Apr 11, 2023

Description of the bug

Expected behavior

Actual behavior

Version of rustc

Automated bug report

Software version

Operating system

Command-line

Environment variables

Git version

Hooks

Hook post-applypatch

Hook post-checkout

Hook post-commit

Hook post-merge

Hook post-rewrite

Hook pre-auto-gc

Hook reference-transaction

Events

Event ID: 24, transaction ID: 21 (message: hook-post-checkout)

Event ID: 23, transaction ID: 20 (message: reference-transaction)

Event ID: 22, transaction ID: 19 (message: hook-post-rewrite)

Event ID: 21, transaction ID: 18 (message: post-commit)

Event ID: 19, transaction ID: 17 (message: reference-transaction)

Version of git-branchless

Version of git

arxanas commented Apr 14, 2023

mlanln commented Apr 14, 2023

arxanas commented Apr 14, 2023

mlanln commented Apr 14, 2023

arxanas commented Apr 14, 2023

auscompgeek commented Apr 17, 2023 • edited

arxanas commented Apr 18, 2023

chriskrycho commented Jul 12, 2023

halostatue commented Feb 20, 2024

robinst commented Apr 9, 2024

Version of `rustc`

Hook `post-applypatch`

Hook `post-checkout`

Hook `post-commit`

Hook `post-merge`

Hook `post-rewrite`

Hook `pre-auto-gc`

Hook `reference-transaction`

Version of `git-branchless`

Version of `git`

auscompgeek commented Apr 17, 2023 •

edited