#12447 Divergent rawhide branch of rust-futures-locks
Closed: Fixed with Explanation a month ago by msuchy. Opened a month ago by msuchy.

I have seen issue in dist-git that I do no understand. It may innocent, but false track of some attack. I would like to find explanation for this.

It is divergent rawhide branches of rust-future-locks. See:
Screenshot_20241110_085720.png

How I find it:

For the SPDX work I have on my workstation full clone of almost all dist-git so I can periodically check if License tag in SPEC file is in Callaway or SPDX format. Or if there is some other issue in the SPDX formula. Every few days (max two weeks) I do git pull in every dist-git repo I track.

Today I find this error in the log (note that I usually do not read log of these git-pull, so it may be older issue]:

remote: Enumerating objects: 9, done.
remote: Counting objects: 100% (9/9), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 2), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (5/5), 1.29 KiB | 1.29 MiB/s, done.
From https://src.fedoraproject.org/rpms/rust-futures-lite
   873563e..f433f0e  rawhide    -> origin/rawhide
   873563e..f433f0e  epel10     -> origin/epel10
   873563e..f433f0e  epel9      -> origin/epel9
   873563e..f433f0e  f39        -> origin/f39
   873563e..f433f0e  f40        -> origin/f40
   873563e..f433f0e  f41        -> origin/f41
   873563e..f433f0e  main       -> origin/main
hint: Diverging branches can't be fast-forwarded, you need to either:
hint:
hint:   git merge --no-ff
hint:
hint: or:
hint:
hint:   git rebase
hint:
hint: Disable this message with "git config advice.diverging false"
fatal: Not possible to fast-forward, aborting.
Could not execute pull: Failed to execute command.
Error pulling 'rust-futures-locks'

And it was not an error of my script. When I cd to that git-repo, there were indeed divergent rawhide branch (see picture above).

I understand that it rarely may happen when we are removing tarball that has files with patents or wrong license. But I was unable to find any issue tracking this. Nor any comment in git commits.

I see similar situation in past months, but I was lazy to snapshot the data. This time I did it.

You can investigate it in https://github.com/xsuchy/rust-futures-locks.
There are two branches:
* rawhide - this is what is rawhide right now in Fedora's dist-git
* old-rawhide - this is what I had as a rawhide on dist. I.e. what was rawhide in Fedora's dist-git few days/weeks ago.

The two branches are divergent and old-rawhide cannot be fast forwarded to rawhide.

The content seems to be the same.


I think this was intentional - the tarball or .src.rpm file had been committed into git accidentally, IIRC. Though if this was fixed by releng there should be a record of it.

https://pagure.io/releng/issue/12350

but I thought we had come up with a way that didn't cause this sort of problem. ;(

OK. That explains this.

Metadata Update from @msuchy:
- Issue close_status updated to: Fixed with Explanation
- Issue status updated to: Closed (was: Open)

a month ago

Log in to comment on this ticket.

Metadata
Attachments 1