Both 'master' and 'trunk'?

Both 'master' and 'trunk'?

[Eli Zaretskii]

Why do we have in the git repo both 'master' and 'trunk' branches?
Shouldn't we remove 'trunk', to prevent some confused soul from
committing to it, and then wondering where did their stuff go?

Re: Both 'master' and 'trunk'?

[Andreas Schwab]

Eli Zaretskii <eliz@gnu.org> writes:

> Why do we have in the git repo both 'master' and 'trunk' branches?
> Shouldn't we remove 'trunk',

Done.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: Both 'master' and 'trunk'?

[Eli Zaretskii]

> From: Andreas Schwab <schwab@suse.de>
> Cc: emacs-devel@gnu.org
> Date: Thu, 13 Nov 2014 16:47:06 +0100
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > Why do we have in the git repo both 'master' and 'trunk' branches?
> > Shouldn't we remove 'trunk',
> 
> Done.

Thanks.

However, I still see it here in the "git branch -a" command.  Should I
do something locally, in addition to what you did?

Re: Both 'master' and 'trunk'?

[Andreas Schwab]

Eli Zaretskii <eliz@gnu.org> writes:

> However, I still see it here in the "git branch -a" command.  Should I
> do something locally, in addition to what you did?

Use git fetch --prune.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: Both 'master' and 'trunk'?

[Eli Zaretskii]

> From: Andreas Schwab <schwab@suse.de>
> Cc: emacs-devel@gnu.org
> Date: Thu, 13 Nov 2014 17:26:23 +0100
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > However, I still see it here in the "git branch -a" command.  Should I
> > do something locally, in addition to what you did?
> 
> Use git fetch --prune.

Thanks, this did the trick.

Re: Both 'master' and 'trunk'?

[Nicolas Richard]

Eli Zaretskii <eliz@gnu.org> writes:
> However, I still see it here in the "git branch -a" command.  Should I
> do something locally, in addition to what you did?

You can use :
`git remote prune origin'
(replace "origin" by whatever name you used for the repo you cloned from).

-- 
Nicolas Richard

Re: Both 'master' and 'trunk'?

[Eli Zaretskii]

> From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
> Date: Thu, 13 Nov 2014 17:29:14 +0100
> Cc: Andreas Schwab <schwab@suse.de>, emacs-devel@gnu.org
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> > However, I still see it here in the "git branch -a" command.  Should I
> > do something locally, in addition to what you did?
> 
> You can use :
> `git remote prune origin'
> (replace "origin" by whatever name you used for the repo you cloned from).

Thanks.  But what do you mean by the comment in parentheses?  I didn't
use any name for the repo, I used a URL.

Re: Both 'master' and 'trunk'?

[Nicolas Richard]

Eli Zaretskii <eliz@gnu.org> writes:
>> From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
>> You can use :
>> `git remote prune origin'
>> (replace "origin" by whatever name you used for the repo you cloned from).
>
> Thanks.  But what do you mean by the comment in parentheses?  I didn't
> use any name for the repo, I used a URL.

Then most likely the name is "origin", because it's the default name.
You can confirm by running "git remote -v".

-- 
Nicolas Richard

Re: Both 'master' and 'trunk'?

[Eli Zaretskii]

> From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
> Cc: Nicolas Richard <theonewiththeevillook@yahoo.fr>,  schwab@suse.de,  emacs-devel@gnu.org
> Date: Thu, 13 Nov 2014 21:54:52 +0100
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> >> From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
> >> You can use :
> >> `git remote prune origin'
> >> (replace "origin" by whatever name you used for the repo you cloned from).
> >
> > Thanks.  But what do you mean by the comment in parentheses?  I didn't
> > use any name for the repo, I used a URL.
> 
> Then most likely the name is "origin", because it's the default name.
> You can confirm by running "git remote -v".

Ah, okay.  It's indeed "origin".

Thanks.

Re: Both 'master' and 'trunk'?

[Nicolas Richard]

Le 14/11/2014 06:27, Eli Zaretskii a écrit :
> Ah, okay.  It's indeed "origin".

FWIW I just realized that I like this presentation of git concepts :
http://gitolite.com/gcs.html
because it's short and focuses on ideas. That also means it won't get
you started if you want to do things and know nothing, but my guess is
that you already know the basic git commit/pull/push stuff.

If you want a quick presentation on remotes, they are explained from
this point: http://gitolite.com/gcs.html#(23)

Nicolas.

Re: Both 'master' and 'trunk'?

[Eli Zaretskii]

> Date: Fri, 14 Nov 2014 11:01:36 +0100
> From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
> CC: schwab@suse.de, emacs-devel@gnu.org
> 
> Le 14/11/2014 06:27, Eli Zaretskii a écrit :
> > Ah, okay.  It's indeed "origin".
> 
> FWIW I just realized that I like this presentation of git concepts :
> http://gitolite.com/gcs.html
> because it's short and focuses on ideas. That also means it won't get
> you started if you want to do things and know nothing, but my guess is
> that you already know the basic git commit/pull/push stuff.

Thanks.  However, concepts presented at this level are not my problem
where I am now.  The problem for me is to associate the terminology
(which is perverse at times, and seems to be deliberately invented to
confuse and trip someone who comes from another VCS) with the muscle
memory of the daily workflows.