Re: branch main created (now ffb30cd7373)

Re: branch main created (now ffb30cd7373)

[Ihor Radchenko]

Bastien Guerry <bzg@gnu.org> writes:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>> It looks like someone has pushed a 'main' branch to the Emacs Git
>> repository, and that branch looks like it belongs to the Org Git
>> repository?
>
> I didn't push anything since Org 9.6, I'll see what happened here and
> try to fix it later (>7pm CET), unless Kyle or Ihor fix it before.

From git log on Emacs main vs. Org main, it looks like Jeremie messed
something when pushing his patch upstream. See
https://orgmode.org/list/87lenob0ql.fsf@gmail.com

Jeremie, it looks like your upstream git configuration is off. Your
commit did not land onto Org git repo upstream and instead messed up the
main Emacs repo. If you need any help with git setup, please let us know.

Eli, I think you can simply remote this erroneously pushed branch.

Jeremie can push his commit to Org repo after fixing the problem with
local git setup.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: branch main created (now ffb30cd7373)

[Eli Zaretskii]

Jeremie, Bastien,

It looks like someone has pushed a 'main' branch to the Emacs Git
repository, and that branch looks like it belongs to the Org Git repository?

Was that some Git snafu?  Or was it intended (and if so, why)?

If this is an accident, please delete the branch.

Re: branch main created (now ffb30cd7373)

[Bastien Guerry]

Eli Zaretskii <eliz@gnu.org> writes:

> It looks like someone has pushed a 'main' branch to the Emacs Git
> repository, and that branch looks like it belongs to the Org Git
> repository?

I didn't push anything since Org 9.6, I'll see what happened here and
try to fix it later (>7pm CET), unless Kyle or Ihor fix it before.

-- 
 Bastien

Re: branch main created (now ffb30cd7373)

[Eli Zaretskii]

> From: Ihor Radchenko <yantar92@posteo.net>
> Cc: Eli Zaretskii <eliz@gnu.org>,  Jeremie Juste <jeremiejuste@gmail.com>,
>   emacs-devel@gnu.org
> Date: Sun, 04 Dec 2022 05:33:27 +0000
> 
> Eli, I think you can simply remote this erroneously pushed branch.

Done.

Re: branch main created (now ffb30cd7373)

[Jeremie Juste]

Hello,

On Sunday,  4 Dec 2022 at 13:44, Eli Zaretskii wrote:
>> From: Ihor Radchenko <yantar92@posteo.net>
>> Cc: Eli Zaretskii <eliz@gnu.org>,  Jeremie Juste <jeremiejuste@gmail.com>,
>>   emacs-devel@gnu.org
>> Date: Sun, 04 Dec 2022 05:33:27 +0000
>> 
>> Eli, I think you can simply remote this erroneously pushed branch.
>
> Done.

My apologies for causing this mess. I feel really bad for my delayed response
and the extra work you had to put in. I'll be more careful. 

Best regards,
Jeremie