Git push leaves working directory dirty, preventing further pushes.

Shotgunosine commented 1 year ago

What went wrong?

I'm trying to use git to upload derivatives to ds004787. When I was uploading yesterday I ran into a "Working directory has unstaged changes" error on my second git push. @effigies rolled back a few commits and I was able to push those changes. I just committed a bunch more files locally and tried to push, but I'm again getting the "Working directory has unstaged changes" error. Can you take a look and see what the unstaged changes are? Is there anything I can do on my side to prevent triggering the creation of unstaged changes?

Expected behavior

I expect to be able to use git to push changes and to then use git annex to upload the annexed files.

How to reproduce

clone ds004787
make some changes and commit them
try to push them to open neuro.

Desktop

OS: Red Hat Enterprise Linux 8.8 (Ootpa) git version 2.42.0 openneuro version 4.20.3 + the changes described in #2924, available here: https://github.com/Shotgunosine/openneuro.

(openneuro) [nielsond@helix src]$ git-annex version
git-annex version: 10.20230626-g801c4b7
build flags: Assistant Webapp Pairing Inotify DBus DesktopNotify TorrentParser MagicMime Benchmark Feeds Testsuite S3 WebDAV
dependency versions: aws-0.22 bloomfilter-2.0.1.0 cryptonite-0.29 DAV-1.3.4 feed-1.3.2.0 ghc-8.10.7 http-client-0.7.9 persistent-sqlite-2.13.0.3 torrent-10000.1.1 uuid-1.3.15 yesod-1.6.1.2
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL X*
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs httpalso borg hook external
operating system: linux x86_64
supported repository versions: 8 9 10
upgrade supported from repository versions: 0 1 2 3 4 5 6 7 8 9 10

Phone

No response

Additional information

No response

nellh commented 1 year ago

@Shotgunosine I'm still looking into the cause of this but could you try pushing again? I've reset the empty diff unstaged changes for your dataset after saving a backup for debugging this.

Shotgunosine commented 1 year ago

@effigies here's the file listing you asked for: git_files.txt

Shotgunosine commented 1 year ago

@nellh, Sorry but my local git repo for this seems to be broken. I'd like to try just uploading a new dataset but I'm getting an error:

#
# Fatal error in , line 0
# Fatal JavaScript invalid size error 195633109 (see crbug.com/1201626)
#
#
#
#FailureMessage Object: 0x7fffa7a57630
 1: 0x14a4553165d7  [/gpfs/gsfs9/users/nielsond/python/envs/openneuro/bin/../lib/libnode.so.115]
 2: 0x14a455fd36ef V8_Fatal(char const*, ...) [/gpfs/gsfs9/users/nielsond/python/envs/openneuro/bin/../lib/libnode.so.115]
 3: 0x14a4558cfc6b  [/gpfs/gsfs9/users/nielsond/python/envs/openneuro/bin/../lib/libnode.so.115]
 4: 0x14a455cd5cc4 v8::internal::Runtime_StringToArray(int, unsigned long*, v8::internal::Isolate*) [/gpfs/gsfs9/users/nielsond/python/envs/openneuro/bin/../lib/libnode.so.115]
 5: 0x14a45555b2b6  [/gpfs/gsfs9/users/nielsond/python/envs/openneuro/bin/../lib/libnode.so.115]
Illegal instruction (core dumped)

Shotgunosine commented 1 year ago

Oh actually, maybe the repo's not dead after all. Here's the git status on the local main that @effigies asked for. git_status_main.txt

OpenNeuroOrg / openneuro