lilypond-devel
[Top][All Lists]
Advanced

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

Re: Patchy email


From: David Kastrup
Subject: Re: Patchy email
Date: Fri, 26 Jul 2019 17:13:20 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)

David Kastrup <address@hidden> writes:

> David Kastrup <address@hidden> writes:
>
>> fatal: Not a valid object name master
>>
>> Apparently, the patch from
>> commit 7583351fbf2f08a4d1f3f0b075fe8b691adc0b95
>> Author: Knut Petersen <address@hidden>
>> 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.

-- 
David Kastrup



reply via email to

[Prev in Thread] Current Thread [Next in Thread]