Skip to content

bump base#12956

Merged
Frenzie merged 1 commit into
koreader:masterfrom
benoit-pierre:pr/bump_base
Dec 29, 2024
Merged

bump base#12956
Frenzie merged 1 commit into
koreader:masterfrom
benoit-pierre:pr/bump_base

Conversation

@benoit-pierre

@benoit-pierre benoit-pierre commented Dec 29, 2024

Copy link
Copy Markdown
Member

@Frenzie Frenzie added this to the 2025.01 milestone Dec 29, 2024
@Frenzie
Frenzie merged commit 0b278c5 into koreader:master Dec 29, 2024
@benoit-pierre
benoit-pierre deleted the pr/bump_base branch December 29, 2024 11:07
@NiLuJe

NiLuJe commented Jan 1, 2025

Copy link
Copy Markdown
Member

The commit hash seems wrong?

i.e., it's actually 9c75c5ad685b47d4b5195cad8d715f060e880d79 in koreader/koreader-base, but this points to 922973f2e11610fb0548dc091e1ba4843a0ce975 (your own tree?).

This leads to git rightfully failing to update the submodule:

fatal: transport 'file' not allowed
fatal: Fetched in submodule path 'base', but it did not contain 922973f2e11610fb0548dc091e1ba4843a0ce975. Direct fetching of that commit failed.

@Frenzie

Frenzie commented Jan 1, 2025

Copy link
Copy Markdown
Member

I noticed it was wrong the other day (a little too late), but it still worked out for me at the time so I ignored it in favor of the next natural base bump.

E.g., this is my local base after updating the submodule a few days ago:

commit 922973f2e11610fb0548dc091e1ba4843a0ce975 (HEAD)
Author: Benoit Pierre <benoit.pierre@gmail.com>
Date:   Thu Dec 12 17:10:19 2024 +0100

    [TMP] workflow dispatch

commit 9c75c5ad685b47d4b5195cad8d715f060e880d79 (origin/master, origin/HEAD)
Author: Benoit Pierre <benoit.pierre@gmail.com>
Date:   Wed Dec 25 10:43:18 2024 +0100

    drop openssl in favor of libressl

@Frenzie

Frenzie commented Jan 1, 2025

Copy link
Copy Markdown
Member

I have git 2.45.2.

@NiLuJe

NiLuJe commented Jan 1, 2025

Copy link
Copy Markdown
Member

Huh. Doesn't resolve on my end (git 2.47.0), but I probably don't have @benoit-pierre's remote setup in my front checkout.

(I assume if I had, it would automagically figure it out).

@Frenzie

Frenzie commented Jan 1, 2025

Copy link
Copy Markdown
Member

Neither do I though, on this particular laptop:

$ git remote -v
Commodore64user git@github.com:Commodore64user/KOReader_fork.git (fetch)
Commodore64user git@github.com:Commodore64user/KOReader_fork.git (push)
origin  git@github.com:Frenzie/koreader.git (fetch)
origin  git@github.com:Frenzie/koreader.git (push)
upstream        git@github.com:koreader/koreader.git (fetch)
upstream        git@github.com:koreader/koreader.git (push)

Which would suggests it's not related to git at all, but rather to GitHub, in which case it's most likely this (probably coupled with an x-hour undo functionality):
image

@benoit-pierre

Copy link
Copy Markdown
Member Author

Damn, sorry about that… That's a commit I have on my master branch to be able to test workflow dispatching on derived branches.

@benoit-pierre benoit-pierre mentioned this pull request Jan 2, 2025
0xstillb pushed a commit to 0xstillb/koreader-thai that referenced this pull request May 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Pocketbook cannot update koreader PocketBook: Crash when connecting to an OPDS server via HTTPS

3 participants