[-- Attachment #1.1: Type: text/plain, Size: 440 bytes --] 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 [-- Attachment #1.2: Type: text/html, Size: 3987 bytes --]
Hi Timothy, Timothy <tecosaur@gmail.com> 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
[-- Attachment #1: Type: text/plain, Size: 683 bytes --] 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 <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. 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
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).
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 <manikulin@gmail.com> 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