Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/develop' into stable * Make Olympus decompressor faster (-13%) * Make Sony LJpeg decompressor faster (-33%) * Support broken-by-design Blackmagic uncompressed DNG's. Refs. #11495. * OM System OM-1 Mark II support. Fixes #16297. * Fujifilm X100VI support. Fixes #16393. * Sony ILCE-9M3 support. Fixes #16523. * Phase One P25+ support. Fixes #16539. * Add Panasonic DC-TZ95D alias. Fixes #16353. * Remove explicit crop from Fujifilm X-Trans gen-4/5 cameras. Fixes #5729. * Leica SL3 normalization * Fix up Panasonic DMC-FZ28 crop modes. Fixes #16457. * Add unsupported Panasonic placeholders * Add unsupported Canon placeholders * Add Fujifilm X100VI placeholder
- Loading branch information
b28b285There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this commit, I am getting the below errors when doing "git submodule update --init --recursive"
b28b285There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Run
git submodule updateagain and it should work.b28b285There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@TurboGit Yes, but the nightly build will fail. Can something be done about it?
b28b285There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I see that's a new commit not a previous one that was fixed just after.
b28b285There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like a commit was not pushed on RawSpeed sub-module. @LebedevRI ?
b28b285There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ugh. Post-morten:
So what happened is i used
git guito copy the commit message from the merge commiti did on rawspeed's
stablebranch, and then instead of closing the UI, i pressed (WHY???) commit.That amended the merge commit, with no changes except the commit date.
But that was after the
upstream/stablebranch was pushed.I, then, must have, checked out the
stable(WHYYY?? why notupstream/stable?) branch insrc/external/rawspeed,committed the change to the darktable repo, and pushed. And that is how we ended up with wrong commit hash.
Please, just revert obviously-broken changes like this... Sorry.
It does not look like it's possible to prevent github from rejecting git pushes
that touch specific files (and forcing PR's to be used to update them), that is quite unfortunate.
I don't suppose there's interest in just forcing everything to go through PR's?
b28b285There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, those issues are very rare we don't need to make the workflow harder. Breaking is not a big issue as long as the fix is fast as it was here. All good, and thanks for recovering build.
b28b285There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:/