Re: dist-git: Diverging branches can't be fast-forwarded

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, Jul 22, 2023 at 09:08:37AM +0200, Miroslav Suchý wrote:
> Dne 21. 07. 23 v 10:50 Zbigniew Jędrzejewski-Szmek napsal(a):
> > > Is this expected? Or is this sign of something malicious happenening?
> > Dunno. Generally the most likely explanation would be that you have local
> > commits. But if that is impossible, then something strange is going on.
> > Can you identify the repos in question?
> 
> It took some time... I found one:
> 
> It is a package xorg-x11-xdm
> 
> Now I see:
> 
> * 1ee5a42 (HEAD -> rawhide, origin/rawhide, origin/main, origin/f38, origin/f37, origin/HEAD)Remove duplicated patch
> * d97e4c6Unretire xorg-x11-xdm package
> * a9058e1Unretirement request: https://pagure.io/releng/issue/11456
> * e776f0fOrphaned for 6+ weeks
> * 6f197fa (origin/f36)- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
> ....
> 
> 
> But the checkout from past I have is:
> 
> * 8a9aff8 (HEAD -> rawhide)Unretirement request: https://pagure.io/releng/issue/11456
> * e776f0fOrphaned for 6+ weeks
> * 6f197fa (origin/f36)- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
> 
> So the commit where it diverge is commit:
> 
> commit 8a9aff84896f28b93851579600afdc59b75b7710 (HEAD -> rawhide)
> Author: Tomas Hrcka <thrcka@xxxxxxxxxx>
> Date:   Thu Jun 8 15:06:43 2023 +0200
> 
>    Unretirement request: https://pagure.io/releng/issue/11456
> 
> That has been replaced by:
> 
> commit a9058e1cce504e6b354b59d6711d76aeb0a8418c
> Author: Tomas Hrcka <thrcka@xxxxxxxxxx>
> Date:   Wed Jun 14 14:35:41 2023 +0200
> 
>    Unretirement request: https://pagure.io/releng/issue/11456
> 
> I repeat myself: this my local checkout that was done by "fedpkg clone" and
> I never changed anything in this git repo. I have never made a commit there.
> I just read the data. And every two weeks I am doing git-pull there.

Tomáš,
do you know what's going on here?

Zbyszek
_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Fedora Announce]     [Fedora Users]     [Fedora Kernel]     [Fedora Testing]     [Fedora Formulas]     [Fedora PHP Devel]     [Kernel Development]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Gimp]     [Yosemite News]

  Powered by Linux