[Filesystems-devel] Bug#1025791: fsck.f2fs is unable to check mounted FS

Michael Tokarev mjt at tls.msk.ru
Tue Dec 13 20:53:53 GMT 2022


13.12.2022 19:56, Theodore Ts'o wrote:
..

>> I pushed "mjt" branch yesterday to the repository (without pristine-tar
>> and upstream pieces so far) which updates f2fs to 1.15 and adds minor
>> cleanups to d/rules. Please take a look.
> 
> Thanks!  The main thing I will note is that it appears that you
> checked in f2fs-tools v1.15.0 as a squashed commit.  That is, the
> signle commit d0ba994589b5 seems to be a delta between v1.14.0 and
> v1.15.0.  What I've done instead is do a git fetch of the upstream git
> repo[1] and then performed a "git merge v1.15.0".  This allows the
> full upstream git history to be in the debian branch, which makes
> future cherry-picks and merges to be easier.

I sure know about git and about upstream repository and about merging
with it. I maintain several packages myself this way, keeping all
upstream history in debian/upstream branch and merging with
debian/master. I especially verified that d/gbp.conf is listing
upstream-vcs-tag and that I do have proper tag fetched from the
upstream repository on git.kernel.org. And only after that I fired
up gbp import-orig --uscan -v, noticing it figured out the right
upstream tag.. It shouldn've done things like this, importing whole
1.15 as a single delta, that's definitely not something which was
intended. It's excellent you've noticed it, - it's definitely a
bug on my side and I yet to see how it ended up like that.
Thank you for spotting this!

(and now this has absolutely nothing to do with #1025791 anyway.. ;))

/mjt



More information about the Filesystems-devel mailing list