Re: [SOLVED] Re: 2 commits pushed on gerrit but not retrievable and not present in cgit.
On Tue, Dec 22, 2020 at 4:42 PM julien2412 wrote: > > sberg wrote > > both of them are "Marking change merged without cherry-picking to > > branch, as the resulting commit would be empty." i.e., apparently some > > other commit(s) meanwhile made the exact same changes? > > Thank you for the feedback Stephan! > Indeed for https://gerrit.libreoffice.org/c/core/+/108120, it's empty. > For the other, it's not empty but saw also this message, weird... that's because we use the "cherry-pick on top of branch" strategy. It would be empty if it were rebased on top of current master. That is what happened for the other patchset - for that you triggered a rebase and it already was empty at that point... ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[SOLVED] Re: 2 commits pushed on gerrit but not retrievable and not present in cgit.
sberg wrote > both of them are "Marking change merged without cherry-picking to > branch, as the resulting commit would be empty." i.e., apparently some > other commit(s) meanwhile made the exact same changes? Thank you for the feedback Stephan! Indeed for https://gerrit.libreoffice.org/c/core/+/108120, it's empty. For the other, it's not empty but saw also this message, weird... At least nothing lost :-) -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
2 commits pushed on gerrit but not retrievable and not present in cgit.
Hello, On branch master, I pushed these commits: - https://gerrit.libreoffice.org/c/core/+/106303 tdf#124176: Use pragma once instead of include guards from çağatay kılınç - https://gerrit.libreoffice.org/c/core/+/108120 Removed executable permission on file docx from Andrea Gelmini I don't see them on https://cgit.freedesktop.org/libreoffice/core/log/ and I didn't retrieve them on my local repo. Here's my git/.config: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = ssh://serval2...@gerrit.libreoffice.org:29418/core.git #url = ssh://logerrit/core fetch = +refs/heads/*:refs/remotes/origin/* pushurl = ssh://logerrit/core [branch "master"] remote = origin merge = refs/heads/master [submodule "translations"] active = true #url = ssh://serval2...@gerrit.libreoffice.org:29418/translations #url = git://gerrit.libreoffice.org/translations url = https://gerrit.libreoffice.org/translations [submodule "dictionaries"] active = true url = ssh://serval2...@gerrit.libreoffice.org:29418/dictionaries #url = https://gerrit.libreoffice.org/dictionaries [submodule "helpcontent2"] active = true url = ssh://serval2...@gerrit.libreoffice.org:29418/help #url = https://gerrit.libreoffice.org/help [protocol] version = 2 Any thoughts? Did I miss something obvious? Julien -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 2 commits pushed on gerrit but not retrievable and not present in cgit.
On 22/12/2020 16:06, julien2412 wrote: On branch master, I pushed these commits: - https://gerrit.libreoffice.org/c/core/+/106303 tdf#124176: Use pragma once instead of include guards from çağatay kılınç - https://gerrit.libreoffice.org/c/core/+/108120 Removed executable permission on file docx from Andrea Gelmini both of them are "Marking change merged without cherry-picking to branch, as the resulting commit would be empty." i.e., apparently some other commit(s) meanwhile made the exact same changes? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
