* Re: branch main created (now ffb30cd7373)
@ 2022-12-04 6:31 Eli Zaretskii
2022-12-04 10:22 ` Bastien Guerry
0 siblings, 1 reply; 5+ messages in thread
From: Eli Zaretskii @ 2022-12-04 6:31 UTC (permalink / raw)
To: Jeremie Juste, Bastien; +Cc: emacs-devel
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: branch main created (now ffb30cd7373)
2022-12-04 6:31 branch main created (now ffb30cd7373) Eli Zaretskii
@ 2022-12-04 10:22 ` Bastien Guerry
2022-12-04 5:33 ` Ihor Radchenko
0 siblings, 1 reply; 5+ messages in thread
From: Bastien Guerry @ 2022-12-04 10:22 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Jeremie Juste, emacs-devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: branch main created (now ffb30cd7373)
2022-12-04 10:22 ` Bastien Guerry
@ 2022-12-04 5:33 ` Ihor Radchenko
2022-12-04 11:44 ` Eli Zaretskii
0 siblings, 1 reply; 5+ messages in thread
From: Ihor Radchenko @ 2022-12-04 5:33 UTC (permalink / raw)
To: Bastien Guerry; +Cc: Eli Zaretskii, Jeremie Juste, emacs-devel
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: branch main created (now ffb30cd7373)
2022-12-04 5:33 ` Ihor Radchenko
@ 2022-12-04 11:44 ` Eli Zaretskii
2022-12-04 22:06 ` Jeremie Juste
0 siblings, 1 reply; 5+ messages in thread
From: Eli Zaretskii @ 2022-12-04 11:44 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: bzg, jeremiejuste, emacs-devel
> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: branch main created (now ffb30cd7373)
2022-12-04 11:44 ` Eli Zaretskii
@ 2022-12-04 22:06 ` Jeremie Juste
0 siblings, 0 replies; 5+ messages in thread
From: Jeremie Juste @ 2022-12-04 22:06 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Ihor Radchenko, bzg, emacs-devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-12-04 22:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-04 6:31 branch main created (now ffb30cd7373) Eli Zaretskii
2022-12-04 10:22 ` Bastien Guerry
2022-12-04 5:33 ` Ihor Radchenko
2022-12-04 11:44 ` Eli Zaretskii
2022-12-04 22:06 ` Jeremie Juste
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).