From: Bill Wohler <wohler@newt.com>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: emacs-devel@gnu.org
Subject: Re: Emacs branches in git
Date: Sun, 16 Feb 2014 16:36:49 -0800 [thread overview]
Message-ID: <19051.1392597409@olgas.newt.com> (raw)
In-Reply-To: <87txbyd38j.fsf@yandex.ru>
Dmitry Gutov <dgutov@yandex.ru> wrote:
> Bill Wohler <wohler@newt.com> writes:
>
> >>> Please see http://nvie.com/posts/a-successful-git-branching-model/ for
> >>> the rationale.
>
> I don't see any justification there, except "We consider origin/master
> to be ... a production-ready state." Which is just an arbitrary opinion.
OK, it might not have justification, but it isn't arbitrary. What is the
justification for *not* doing this?
> >>> Also, in git, release branches are deleted when they are
> >>> no longer needed.
>
> So what? Tags can live on.
Except you will no longer see them in git log output.
> >> You are talking past each other. You want to organize tags into a
> >> directory of tags,
> >
> > s/tags/branches/
>
> ??
I was suggesting directories of branches, not tags. Regardless of where
you tag, creating a hierarchy of branches would help clean things up and
make things easier to find.
Can you organize tags into a directory, and would "git tag" only list
the directory? That would be neat, because then I could put, for
example, the MH-E tags into a subdirectory so Emacs users would not have
them in their "git tags" output.
> >> Dmitry is talking about placing tags all into a
> >> single branch. Which makes very little sense.
>
> If master is to be used "for tagged releases", all release-tagged
> revisions have to be able to line up in one branch. Interspersed with
> plain revisions, of course.
>
> > Except that's not the point, but rather a side-effect. The point is that
> > master holds the production-ready commits.
>
> Yes, and why do we need that? If one wants to use the latest release,
> they can just fetch the list of tags, and then checkout the one with the
> greatest number.
While an expert might have a lot more reasons, a couple of things that
come to mind are:
- Looking for and checking out a tag is more work than "git
checkout master".
- Conversely, if master tracked the release version, you just have to do
a "git pull" to stay up to date with the latest released version.
- Checking out a tag doesn't work if you have continuous integration.
Granted, you wouldn't have CI with master in this scheme, but the
generalization may apply elsewhere.
- Checking out a tagged version puts you in a "detached HEAD" state for
better or for worse.
- git log master would yield a concise history of releases.
Since branches are cheap, why not?
> >> But it's not obvious to
> >> casual users of gits that you can have tags in a directory structure
> >> that has nothing to do with either the work directory or the commit
> >> tree.
> >
> > Can you expound on that?
>
> Yes, please.
--
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD
next prev parent reply other threads:[~2014-02-17 0:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-16 4:50 Emacs branches in git Bill Wohler
2014-02-16 5:01 ` Dmitry Gutov
2014-02-16 20:11 ` Bill Wohler
2014-02-16 20:17 ` David Kastrup
2014-02-16 22:30 ` Bill Wohler
2014-02-16 23:53 ` Dmitry Gutov
2014-02-17 0:36 ` Bill Wohler [this message]
2014-02-17 2:22 ` Dmitry Gutov
2014-02-17 9:11 ` Andreas Schwab
2014-02-17 12:51 ` Thien-Thi Nguyen
2014-02-17 22:51 ` Xue Fuqiao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19051.1392597409@olgas.newt.com \
--to=wohler@newt.com \
--cc=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.