DesertRose Posted 12 hours ago Report Share Posted 12 hours ago (edited) When I try to pull the changes made to my fork by sync it to 0ad:main I get the error: Downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (101 KB) Error downloading object: binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e69): Smudge error: Error downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e699101e3ab0b367bc4557a5fe155b395df3a28d3c3ecc3c5d7bb4b45565): batch response: Repository or object not found: https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork.git/objects/batch Check that it exists and that you have proper access to it Errors logged to '/home/tre/git/0ad/0ad-DR_fork/.git/lfs/logs/20260321T085833.61052115.log'. Use `git lfs logs last` to view the log. error: external filter 'git-lfs filter-process' failed Spoiler git-lfs/3.7.1 (GitHub; linux amd64; go 1.25.3 X:nodwarf5) git version 2.53.0 $ git-lfs filter-process Error downloading object: binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e69): Smudge error: Error downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e699101e3ab0b367bc4557a5fe155b395df3a28d3c3ecc3c5d7bb4b45565): batch response: Repository or object not found: https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork.git/objects/batch Check that it exists and that you have proper access to it batch response: Repository or object not found: https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork.git/objects/batch Check that it exists and that you have proper access to it Error downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e699101e3ab0b367bc4557a5fe155b395df3a28d3c3ecc3c5d7bb4b45565) github.com/git-lfs/git-lfs/v3/errors.newWrappedError github.com/git-lfs/git-lfs/v3/errors/types.go:228 github.com/git-lfs/git-lfs/v3/errors.Wrap github.com/git-lfs/git-lfs/v3/errors/errors.go:74 github.com/git-lfs/git-lfs/v3/lfs.(*GitFilter).downloadFile github.com/git-lfs/git-lfs/v3/lfs/gitfilter_smudge.go:124 github.com/git-lfs/git-lfs/v3/lfs.(*GitFilter).Smudge github.com/git-lfs/git-lfs/v3/lfs/gitfilter_smudge.go:83 github.com/git-lfs/git-lfs/v3/commands.smudge github.com/git-lfs/git-lfs/v3/commands/command_smudge.go:128 github.com/git-lfs/git-lfs/v3/commands.filterCommand github.com/git-lfs/git-lfs/v3/commands/command_filter_process.go:132 github.com/spf13/cobra.(*Command).execute github.com/spf13/cobra@v1.7.0/command.go:944 github.com/spf13/cobra.(*Command).ExecuteC github.com/spf13/cobra@v1.7.0/command.go:1068 github.com/spf13/cobra.(*Command).Execute github.com/spf13/cobra@v1.7.0/command.go:992 github.com/git-lfs/git-lfs/v3/commands.Run github.com/git-lfs/git-lfs/v3/commands/run.go:154 main.main github.com/git-lfs/git-lfs/v3/git-lfs.go:34 runtime.main runtime/proc.go:285 runtime.goexit runtime/asm_amd64.s:1693 Smudge error github.com/git-lfs/git-lfs/v3/errors.newWrappedError github.com/git-lfs/git-lfs/v3/errors/types.go:228 github.com/git-lfs/git-lfs/v3/errors.NewSmudgeError github.com/git-lfs/git-lfs/v3/errors/types.go:314 github.com/git-lfs/git-lfs/v3/lfs.(*GitFilter).Smudge github.com/git-lfs/git-lfs/v3/lfs/gitfilter_smudge.go:100 github.com/git-lfs/git-lfs/v3/commands.smudge github.com/git-lfs/git-lfs/v3/commands/command_smudge.go:128 github.com/git-lfs/git-lfs/v3/commands.filterCommand github.com/git-lfs/git-lfs/v3/commands/command_filter_process.go:132 github.com/spf13/cobra.(*Command).execute github.com/spf13/cobra@v1.7.0/command.go:944 github.com/spf13/cobra.(*Command).ExecuteC github.com/spf13/cobra@v1.7.0/command.go:1068 github.com/spf13/cobra.(*Command).Execute github.com/spf13/cobra@v1.7.0/command.go:992 github.com/git-lfs/git-lfs/v3/commands.Run github.com/git-lfs/git-lfs/v3/commands/run.go:154 main.main github.com/git-lfs/git-lfs/v3/git-lfs.go:34 runtime.main runtime/proc.go:285 runtime.goexit runtime/asm_amd64.s:1693 Have this error for a few days now. Is that an issue I can fix myself, or is this on the remote's side? I can't find any helpful info online. Edited 12 hours ago by DesertRose Quote Link to comment Share on other sites More sharing options...
Stan` Posted 11 hours ago Report Share Posted 11 hours ago Try to to git-lfs pull maybe Basically the issue is that your fork needs to be updated, because new art assets were pushed on main. Quote Link to comment Share on other sites More sharing options...
Atrik Posted 10 hours ago Report Share Posted 10 hours ago @DesertRose I had the same issue. I think I fixed it by doing a git lfs pull as recommended by @Stan`, but it would only work doing so from my own fork. Sync your main branch's fork from the web UI, then use it to re-base any local branches. 1 Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 9 hours ago Report Share Posted 9 hours ago 1 hour ago, Atrik said: @DesertRose I had the same issue. I think I fixed it by doing a git lfs pull as recommended by @Stan`, but it would only work doing so from my own fork. Sync your main branch's fork from the web UI, then use it to re-base any local branches. Having this problem some days ago I did this and it worked Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 8 hours ago Author Report Share Posted 8 hours ago Trying to sync in the web UI gives me this error message: Merge Failed: There was a conflict while merging. Hint: Try a different strategy. And all fixes for it I found are for conflicts with the same repo, not with a parent repo. A comment similar to git merge upstream/main doesn't seem to exist for git-lfs Spoiler git remote add upstream https://gitea.wildfiregames.com/0ad/0ad.git git merge upstream/main Quote Link to comment Share on other sites More sharing options...
Atrik Posted 8 hours ago Report Share Posted 8 hours ago 5 minutes ago, DesertRose said: Merge Failed: There was a conflict while merging. Hint: Try a different strategy. Ah, you edited the main branch of your repo.... The classical workflow would be to not make any of your edits there but on dedicated branches. Assuming we still want to use your main to rebase all local branches --since @guerringuerrin confirmed this worked for him, I'm guessing this was indeed due to something, probably rights, preventing you to pull lfs assets from 0AD's main repo storage-- here is what you could do: Drop all commits you did on main locally Force push your own main branch Try again to sync your main with 0AD's main using the web UI 1 1 Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 7 hours ago Report Share Posted 7 hours ago (edited) And, if dropping your commits doesn’t work for some reason, you can also try resetting your local branch to a few commits earlier in the history. Then try steps 2 and 3 again. View the history to choose where to go with: git log --oneline Then: git reset --hard <commit-hash> Then: 23 minutes ago, Atrik said: 2. Force push your own main branch 3. Try again to sync your main with 0AD's main using the web UI Edited 7 hours ago by guerringuerrin 1 1 Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 7 hours ago Author Report Share Posted 7 hours ago (edited) None of those work. It seems because I merged branches with the main repo it cannot be undone so simply. edit: git reflog git reflog --relative-date The second command is very helpful to make it more clear that the order is chronically DESCENDING. -.- Edited 6 hours ago by DesertRose Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 6 hours ago Report Share Posted 6 hours ago (edited) @DesertRose Can you show what the output of git log --oneline is? edit: I guess for your edit that you managed to fix it. nice! Edited 6 hours ago by guerringuerrin Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 6 hours ago Author Report Share Posted 6 hours ago Can I delete those locally? error: The following untracked working tree files would be overwritten by merge: binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_caryatids.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_decor.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_nature.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_olive_tree.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_props_a.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_roof.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_tile_c.xml binaries/data/mods/public/art/actors/structures/artifacts/statue_caryatid_medium_pedestal.xml binaries/data/mods/public/art/actors/structures/artifacts/statue_caryatid_small_pedestal.xml binaries/data/mods/public/art/actors/structures/athenians/caryatid.xml binaries/data/mods/public/art/actors/structures/athenians/caryatid_large.xml binaries/data/mods/public/art/actors/structures/athenians/erechtheion.xml binaries/data/mods/public/simulation/templates/gaia/ruins/metal_statue_caryatid.xml binaries/data/mods/public/simulation/templates/structures/athen/erechtheion.xml I certainly didn't change them. Quote Link to comment Share on other sites More sharing options...
Atrik Posted 6 hours ago Report Share Posted 6 hours ago 7 minutes ago, DesertRose said: I certainly didn't change them. (I'm not very knowledgeable about this) Those are probably residual changes from when you did git lfs pull. But it got interrupted at the first asset actually in lfs. Just clear them, with git clean -fd should do. Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 6 hours ago Report Share Posted 6 hours ago (edited) 19 minutes ago, DesertRose said: Can I delete those locally? I'm not sure what could happen if you remove them manually. Instead of that I would use git clean to delete untracked files: git clean -fdn To preview what files will be removed, and then: git clean -fd edit: at first glance those are the same files I have problems with some days ago. After cleaning the untracked files, I would suggest the following steps, which worked for me last time: Check where you are in the commit history: git log --oneline --graph Reset your branch to a known good commit (you just need to pick the right one): git reset --hard <commit> Update your remote branch with your local state: git push --force-with-lease your-remote-repo-name <your-main-branch> Then, update/sync the branch using the Gitea web UI (to avoid Git LFS-related issues). Then, git pull Edited 6 hours ago by guerringuerrin 1 Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 6 hours ago Report Share Posted 6 hours ago (edited) @DesertRose Use a commit before 67ee5aaeb5, which is the one that introduced those files. I think you can use: 262c5c037e, Use promises to fetch net messages Edited 6 hours ago by guerringuerrin 1 1 Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 5 hours ago Author Report Share Posted 5 hours ago They come right back, those little @#$%s. Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 5 hours ago Report Share Posted 5 hours ago git reset --hard 262c5c037e should do the work Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 5 hours ago Author Report Share Posted 5 hours ago (edited) $ git reset --hard 262c5c037e HEAD is now at 262c5c037e Use promises to fetch net messages $ git push --force-with-lease origin main Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0) remote: remote: Create a new pull request for 'main': remote: https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork/pulls/new/main remote: remote: . Processing 1 references remote: Processed 1 references in total To https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork.git + 19fe52f328...262c5c037e main -> main (forced update) Sync Fork on gitea $ git pull From https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork 262c5c037e..19fe52f328 main -> origin/main Updating 262c5c037e..19fe52f328 error: The following untracked working tree files would be overwritten by merge: binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_caryatids.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_decor.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_nature.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_olive_tree.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_props_a.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_roof.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_tile_c.xml binaries/data/mods/public/art/actors/structures/artifacts/statue_caryatid_medium_pedestal.xml binaries/data/mods/public/art/actors/structures/artifacts/statue_caryatid_small_pedestal.xml binaries/data/mods/public/art/actors/structures/athenians/caryatid.xml binaries/data/mods/public/art/actors/structures/athenians/caryatid_large.xml binaries/data/mods/public/art/actors/structures/athenians/erechtheion.xml binaries/data/mods/public/simulation/templates/gaia/ruins/metal_statue_caryatid.xml binaries/data/mods/public/simulation/templates/structures/athen/erechtheion.xml Please move or remove them before you merge. Aborting Edited 5 hours ago by DesertRose Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 5 hours ago Report Share Posted 5 hours ago @DesertRose Great. Now: git push --force-with-lease you-remote-repo-name <your-repo-main-branch> Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 5 hours ago Author Report Share Posted 5 hours ago @guerringuerrin You caught me in an edit Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 5 hours ago Report Share Posted 5 hours ago (edited) @DesertRose Ok, your remote now looks good. So instead of git pull try doing this: git fetch git clean -fd git reset --hard origin/main. This should remove those files and bring you an exact copy of your remote repo Edited 5 hours ago by guerringuerrin i forgot the clean command 1 Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 5 hours ago Author Report Share Posted 5 hours ago Now git-lfs makes issues again: Updating files: 100% (57/57), done. Downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (101 KB) Error downloading object: binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e69): Smudge error: Error downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e699101e3ab0b367bc4557a5fe155b395df3a28d3c3ecc3c5d7bb4b45565): batch request: ssh: Could not resolve hostname https: Name or service not known: exit status 255 Errors logged to '/home/tre/git/0ad/0ad-DR_fork/.git/lfs/logs/20260321T163051.234002216.log'. Use `git lfs logs last` to view the log. error: external filter 'git-lfs filter-process' failed fatal: binaries/data/mods/public/art/meshes/props/caryatid.dae: smudge filter lfs failed Tried this: https://wildfiregames.com/forum/topic/135018-git-lfs-issues/ Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 4 hours ago Report Share Posted 4 hours ago (edited) Ok, but it looks like you’re making progress now. Check where your LFS URL is pointing, bc it looks like it is missconfigured because: 21 minutes ago, DesertRose said: batch request: ssh: Could not resolve hostname https: Name or service not known: exit status 255 So, check the LFS URL endpoints with: git lfs env And check for the Endpoint values: They should look like this (note they are none of them are pointing to my remote but official repo instead): If you see bad urls here you can: git lfs uninstall git lfs install git config lfs.url https://gitea.wildfiregames.com/0ad/0ad.git/info/lfs git lfs pull If this pull still fails you can try: GIT_LFS_SKIP_SMUDGE=1 git pull git lfs pull Now, I’m not entirely sure how GIT_LFS_SKIP_SMUDGE works internally besides that it basically skips downloading LFS files during pull, but it has helped me before when I had issues updating my local repo due to LFS errors. Edited 4 hours ago by guerringuerrin 1 Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 4 hours ago Author Report Share Posted 4 hours ago (edited) 22 minutes ago, guerringuerrin said: They should look like this (note they are none of them are pointing to my remote but official repo instead): Oh really? That explains some of my difficulties. :-/ I am still missing the "Endpoint (gg)" one, though. Edited 4 hours ago by DesertRose Quote Link to comment Share on other sites More sharing options...
guerringuerrin Posted 4 hours ago Report Share Posted 4 hours ago gg is how I name my origin. You probably have origin as your local repo, not gg Quote Link to comment Share on other sites More sharing options...
DesertRose Posted 1 hour ago Author Report Share Posted 1 hour ago Endpoint=https://gitea.wildfiregames.com/0ad/0ad.git/info/lfs (auth=basic) Endpoint (upstream)=https://gitea.wildfiregames.com/0ad/0ad.git/info/lfs (auth=basic) Yeah, but I have only those two. Everything seems to work now. 1 Quote Link to comment Share on other sites More sharing options...
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.