Re: master-->main?

[Bhavin Gandhi]

Hi Uwe,

On Mon, 4 Oct 2021 at 17:50, Uwe Brauer  wrote:
>
> Was master «renamed» main, I mean is the default branch now main instead of 
> master?
>

As far as I have understood, yes. master branch was renamed to main.
Reference: https://list.orgmode.org/87ee9bbpc9@gnu.org/

-- 
Regards,
Bhavin Gandhi (bhavin192) | https://geeksocket.in

master-->main?

[Uwe Brauer]

Hi

I did a git pull and obtained 

from git://git.sv.gnu.org/emacs/org-mode
 * [new branch]  bugfix -> origin/bugfix
   dd9105d..fedcb49  emacs-sync -> origin/emacs-sync
 * [new branch]  main   -> origin/main
 * [new tag] release_9.5 -> release_9.5
Your configuration specifies to merge with the ref 'refs/heads/master'
from the remote, but no such ref was fetched.


So I set in my config 

merge = refs/heads/master

To 

merge = refs/heads/main

Was master «renamed» main, I mean is the default branch now main instead of 
master?

Regards

Uwe Brauer 

Re: Org branches: master, main, and maint?

[Samuel Wales]

i have forgotten all my non-basic git, so i guess i am in for a bunch
of figuring out the automatic rebase of my stuff on top of upstream.

perhaps i can do a single git clone, do the rebase, and then change
branches to create the ohters.  but i presume this is a normal git
thing git clone to get rid of stuff lying around, deal with tags, and
deal with branches?

if there is documentation perhaps say that bugfix ~= stable?


On 9/26/21, Max Nikulin  wrote:
> On 26/09/2021 17:31, Bastien wrote:
>> Timothy writes:
>>
>>> I’ve just had a look at the branches, and I see that we currently
>>> have
>>>
>>>  master
>>>  main
>>>  maint
>>
>> You probably listed your local branch with "git branch -a" or by
>> checking your .git/config file.
>>
>> If you clone a fresh repo like this:
>>
>> ~$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git
>>
>> and fetch all the branches (git fetch --all) you should only see
>> the three branches mentioned above.
>
>  git fetch --prune
>
> might help to keep personal local branches but to remove non-existing
> remote ones if you changed URL of origin repository. I renamed old
> "origin" and added new one with savannah URL, so each repository has its
> own branch (That is why I may be a bit wrong concerning exact behavior
> of --prune in this case).
>
>
>


-- 
The Kafka Pandemic

Please learn what misopathy is.
https://thekafkapandemic.blogspot.com/2013/10/why-some-diseases-are-wronged.html

Re: Org branches: master, main, and maint?

[Max Nikulin]

On 26/09/2021 17:31, Bastien wrote:

Timothy writes:


I’ve just had a look at the branches, and I see that we currently
have

 master
 main
 maint


You probably listed your local branch with "git branch -a" or by
checking your .git/config file.

If you clone a fresh repo like this:

~$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git

and fetch all the branches (git fetch --all) you should only see
the three branches mentioned above.


git fetch --prune

might help to keep personal local branches but to remove non-existing 
remote ones if you changed URL of origin repository. I renamed old 
"origin" and added new one with savannah URL, so each repository has its 
own branch (That is why I may be a bit wrong concerning exact behavior 
of --prune in this case).

Re: Org branches: master, main, and maint?

[Timothy]

Hi  Bastien,

> You probably listed your local branch with “git branch -a” or by
> checking your .git/config file.
>
> If you clone a fresh repo like this:
>
> ~$ git clone 
>
> and fetch all the branches (git fetch –all) you should only see
> the three branches mentioned above.
>
> Also, you can now forget code.orgmode.org, I’ve prevented any
> push there.

Yep, I think this was some sort of git leftovers. I’ve done a fresh clone and
I’m now seeing about half as many `origin/*' branches, which I’d consider to be 
a
success. Thanks for clearing this up Bastien .

All the best,
Timothy

Re: Org branches: master, main, and maint?

[Bastien]

Hi Timothy,

Timothy  writes:

> I’ve just had a look at the branches, and I see that we currently
> have
>
> master
> main
> maint

Nope, the official source repository contains 

- main : the development branch (aka the old "master")
- bugfix : the bugfix branch (aka the old "maint")
- km/from-master-emacs : the branch to help with Emacs sync

> My previous impression was that master was the main development
> branch, and maint was for testing (though I wasn’t 100% sure).
> However now there’s master, main, and maint I’m feeling a bit unsure
> of what exactly is going on.
>
> A clarification would be much appreciated .

You probably listed your local branch with "git branch -a" or by
checking your .git/config file.  

If you clone a fresh repo like this:

~$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git

and fetch all the branches (git fetch --all) you should only see
the three branches mentioned above.

Also, you can now forget code.orgmode.org, I've prevented any
push there.

HTH,

-- 
 Bastien

Org branches: master, main, and maint?

[Timothy]

Hello,

I’ve just had a look at the branches, and I see that we currently have
⁃ master
⁃ main
⁃ maint

My previous impression was that `master' was the main development branch, and
`maint' was for testing (though I wasn’t 100% sure). However now there’s 
`master',
`main', and `maint' I’m feeling a bit unsure of what exactly is going on.

A clarification would be much appreciated .

All the best,
Timothy