[PATCH] fdo#42135: Appending a library functionality in Macro Programming missing or misdocumented

Stephan Bergmann sbergman at redhat.com
Mon Oct 29 02:49:36 PDT 2012

On 10/29/2012 10:15 AM, Petr Mladek wrote:
> Stephan Bergmann píše v Pá 26. 10. 2012 v 17:14 +0200:
>> Yeah, by the time I would have got hold of Norbert to ask him what he
>> meant with that, I had already figured out enough of it on my own to get
>> something that looks like it works.  For a commit whose content
>> logically just affects helpcontent2, not also core, what I'd do is
>>     git submodule
>>       # sanity check, should display all submodules w/o leading
>>       # '+', '-', or 'U'
>>     cd helpcontent2
>>     git am ... # or whatever
>>     git push
> Hmm, I get the following error at this stage:
> --- cut ---
> $> git push
> fatal: You are not currently on a branch.
> To push the history leading to the current (detached HEAD)
> state now, use
>      git push origin HEAD:<name-of-remote-branch>
> --- cut ---

Ach, this needs to be "git push origin HEAD:master" (it never works to 
write down instructions by heart).

>> (Whether the commit/push in core is really necessary, or whether gerrit
>> would do that automatically I'm not really sure, cf.
>> <http://lists.freedesktop.org/archives/libreoffice/2012-October/040204.html>
>> "[Libreoffice-commits] .: 5 commits [...]"  However, if it is not
>> necessary, it should be harmless, as the then-necessary "git pull -r"
>> would collapse the manual commit into gerrit's automatic one.)
> Norbert, Stefan, I hope that you will somehow sort it out. I still hope
> that I will not need to read any huge amount of git documentation to be
> able to commit :-)

This stop of automatic gerrit core commits was an unexpected side-effect 
of another commit I reverted now, see my other mail in this thread.


More information about the LibreOffice mailing list