[prev in list] [next in list] [prev in thread] [next in thread]
List: fedora-devel-list
Subject: Re: dist-git: Diverging branches can't be fast-forwarded
From: Miroslav_Suchý <msuchy () redhat ! com>
Date: 2023-07-22 7:08:37
Message-ID: 5db5818a-e8b3-a4e6-95f7-65315cd2cef4 () redhat ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
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@redhat.com>
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@redhat.com>
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.
--
Miroslav Suchy, RHCA
Red Hat, Manager, Packit and CPT, #brno, #fedora-buildsys
[Attachment #5 (text/html)]
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<div class="moz-cite-prefix">Dne 21. 07. 23 v 10:50 Zbigniew
Jędrzejewski-Szmek napsal(a):<br>
</div>
<blockquote type="cite" cite="mid:ZLpG0O6KupXJGIGX@kawka3.in.waw.pl">
<blockquote type="cite" style="color: #007cff;">
<pre class="moz-quote-pre" wrap="">Is this expected? Or is this sign of \
something malicious happenening? </pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">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?</pre>
</blockquote>
<p>It took some time... I found one:</p>
<p><span style="font-family:monospace"><span
style="color:#000000;background-color:#ffffff;">It is a
package xorg-x11-xdm</span><br>
</span></p>
<p><span style="font-family:monospace">Now I see:</span></p>
<p><span style="font-family:monospace"><span
style="color:#000000;background-color:#ffffff;">* </span><span
style="color:#b26818;background-color:#ffffff;">1ee5a42 (</span><span
style="font-weight:bold;color:#54ffff;background-color:#ffffff;">HEAD
-> </span><span
style="font-weight:bold;color:#54ff54;background-color:#ffffff;">rawhide</span><span
style="color:#b26818;background-color:#ffffff;">, </span><span
style="font-weight:bold;color:#ff5454;background-color:#ffffff;">origin/rawhide</span><span
style="color:#b26818;background-color:#ffffff;">, </span><span
style="font-weight:bold;color:#ff5454;background-color:#ffffff;">origin/main</span><span
style="color:#b26818;background-color:#ffffff;">, </span><span
style="font-weight:bold;color:#ff5454;background-color:#ffffff;">origin/f38</span><span
style="color:#b26818;background-color:#ffffff;">, </span><span
style="font-weight:bold;color:#ff5454;background-color:#ffffff;">origin/f37</span><span
style="color:#b26818;background-color:#ffffff;">, </span><span
style="font-weight:bold;color:#ff5454;background-color:#ffffff;">origin/HEAD</span><span
style="color:#b26818;background-color:#ffffff;">)</span><span
style="color:#000000;background-color:#ffffff;"> Remove
duplicated patch
</span><br>
* <span style="color:#b26818;background-color:#ffffff;">d97e4c6</span><span
style="color:#000000;background-color:#ffffff;"> Unretire
xorg-x11-xdm package
</span><br>
* <span style="color:#b26818;background-color:#ffffff;">a9058e1</span><span
style="color:#000000;background-color:#ffffff;"> Unretirement
request: <a class="moz-txt-link-freetext" \
href="https://pagure.io/releng/issue/11456">https://pagure.io/releng/issue/11456</a> \
</span><br>
* <span style="color:#b26818;background-color:#ffffff;">e776f0f</span><span
style="color:#000000;background-color:#ffffff;"> Orphaned for
6+ weeks
</span><br>
* <span style="color:#b26818;background-color:#ffffff;">6f197fa
(</span><span
style="font-weight:bold;color:#ff5454;background-color:#ffffff;">origin/f36</span><span
style="color:#b26818;background-color:#ffffff;">)</span><span
style="color:#000000;background-color:#ffffff;"> - Rebuilt for
<a class="moz-txt-link-freetext" \
href="https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild">https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild</a></span><br>
....</span></p>
<p><span style="font-family:monospace"><br>
</span></p>
<p><span style="font-family:monospace">But the checkout from past I
have is:</span></p>
<p><span style="font-family:monospace"><span
style="color:#000000;background-color:#ffffff;">* </span><span
style="color:#b26818;background-color:#ffffff;">8a9aff8 (</span><span
style="font-weight:bold;color:#54ffff;background-color:#ffffff;">HEAD
-> </span><span
style="font-weight:bold;color:#54ff54;background-color:#ffffff;">rawhide</span><span
style="color:#b26818;background-color:#ffffff;">)</span><span
style="color:#000000;background-color:#ffffff;"> Unretirement
request: <a class="moz-txt-link-freetext" \
href="https://pagure.io/releng/issue/11456">https://pagure.io/releng/issue/11456</a> \
</span><br>
* <span style="color:#b26818;background-color:#ffffff;">e776f0f</span><span
style="color:#000000;background-color:#ffffff;"> Orphaned for
6+ weeks
</span><br>
* <span style="color:#b26818;background-color:#ffffff;">6f197fa
(</span><span
style="font-weight:bold;color:#ff5454;background-color:#ffffff;">origin/f36</span><span
style="color:#b26818;background-color:#ffffff;">)</span><span
style="color:#000000;background-color:#ffffff;"> - Rebuilt for
<a class="moz-txt-link-freetext" \
href="https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild">https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild</a></span><br>
<br>
So the commit where it diverge is commit:</span></p>
<p><span style="font-family:monospace"><span
style="color:#b26818;background-color:#ffffff;">commit
8a9aff84896f28b93851579600afdc59b75b7710 (</span><span
style="font-weight:bold;color:#54ffff;background-color:#ffffff;">HEAD
-> </span><span
style="font-weight:bold;color:#54ff54;background-color:#ffffff;">rawhide</span><span
style="color:#b26818;background-color:#ffffff;">)</span><span
style="color:#000000;background-color:#ffffff;">
</span><br>
Author: Tomas Hrcka <a class="moz-txt-link-rfc2396E" \
href="mailto:thrcka@redhat.com"><thrcka@redhat.com></a> <br>
Date: Thu Jun 8 15:06:43 2023 +0200
<br>
<br>
Unretirement request: <a class="moz-txt-link-freetext" \
href="https://pagure.io/releng/issue/11456">https://pagure.io/releng/issue/11456</a></span></p>
<p><span style="font-family:monospace">That has been replaced by:</span></p>
<p><span style="font-family:monospace"><span
style="color:#b26818;background-color:#ffffff;">commit
a9058e1cce504e6b354b59d6711d76aeb0a8418c</span><span
style="color:#000000;background-color:#ffffff;">
</span><br>
Author: Tomas Hrcka <a class="moz-txt-link-rfc2396E" \
href="mailto:thrcka@redhat.com"><thrcka@redhat.com></a> <br>
Date: Wed Jun 14 14:35:41 2023 +0200
<br>
<br>
Unretirement request: <a class="moz-txt-link-freetext" \
href="https://pagure.io/releng/issue/11456">https://pagure.io/releng/issue/11456</a></span></p>
<p><span style="font-family:monospace">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.<br>
</span></p>
<pre class="moz-signature" cols="120">--
Miroslav Suchy, RHCA
Red Hat, Manager, Packit and CPT, #brno, #fedora-buildsys
</pre>
</body>
</html>
[Attachment #6 (text/plain)]
_______________________________________________
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-leave@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic