Hello,
On 26/07/2019 16:13, David Kastrup wrote:
David Kastrup <d...@gnu.org> writes:
David Kastrup <d...@gnu.org> writes:
fatal: Not a valid object name master
Apparently, the patch from
commit 7583351fbf2f08a4d1f3f0b075fe8b691adc0b95
Author: Knut Petersen <knut_peter...@t-online.de>
Date: Sun Jul 7 13:16:05 2019 +0200
Optimize tree.gittxt messages
We display BRANCH, HEAD, MERGE-POINT
and HISTORY fom merge-point to HEAD.
If we do not find a merge-point we
display the last ten commits if this
is possible.
relies on the existence of a local (rather than upstream) branch
"master", not a good idea. I am backing out this commit from staging:
it needs to get fixed.
Someone or some patchy happening to have a local master branch (a bad
idea since absolutely no development should happen in a local master
branch in our setup) already pushed that commit to staging.
I mean, to master. Pushing to staging was very much the correct step to
take in the life of the patch.
Consequentially, I had to push a revert to staging and hope I'll get it
through without manually tampering with master.
I personally closed the sourceforge ticket with the commit ID etc.
--snip--
pkx166h <https://sourceforge.net/u/lilypond-pkx/> - /3 days ago /
<https://sourceforge.net/p/testlilyissues/issues/5534/#d5a7>
Optimize tree.gittxt messages master staging
author Knut Petersen <knut_peter...@t-online.de>
Sun, 7 Jul 2019 12:16:05 +0100 (13:16 +0200)
committer Knut Petersen <knut_peter...@t-online.de>
Mon, 22 Jul 2019 10:04:40 +0100 (11:04 +0200)
commit 7583351fbf2f08a4d1f3f0b075fe8b691adc0b95
--snip--
However looking at the date stamps of the logs of my patchy runs - the
patchy scrits generate text files for each run - I ran one on the 25th
(pushing Urs trivial checkin) and then before that on the 17th, which
was for Knut's previous fix (and I think included Werner's).
So there is another patchy pushing stuff as Knut's 'failed' commit was
in between those times.
Unless Knut is also running patchy now that he has commit access (and
perhaps didn't have a clean master?).
(I don't want to cast aspersions, but it might be a genuine mistake if
it was Knut). Knut?
James
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel