From: Salikh Zakirov <salikh@gmail.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFC] Introduce .git/BRANCH to point to the current branch
Date: Wed, 05 Dec 2007 06:57:06 +0900 [thread overview]
Message-ID: <4755CD32.7040204@gmail.com> (raw)
In-Reply-To: <m34peyur8r.fsf@roke.D-201>
Jakub Narebski wrote:
>> Salikh Zakirov <salikh@gmail.com> writes:
>>> This combination leads to the confusing user experience
>>> if the branch changes independently of the working directory.
>>> This can happen in following cases:
>
> All those cases are cases of not recommended workflows.
I guess those cases are not recommended exactly because
there are prone to causing confusion with current git.
I use multiple workdirs quite often, and by now learned
not to check out the same branch in different workdirs,
but it would very convenient if it would not be necessary to remember it.
> Please search the archives for idea of BASE extension to index
> (instead of your separate file under .git/refs), and why it is
> not in current git.
I never realized this idea has been already tried. Thanks for the pointer!
I would try to use BASE extension.
> BTW. how in your proposal would you detach HEAD?
Deleting .git/BRANCH should be enough.
But I cannot see the workflow that would need it.
If one checks out older state of the branch, there is no harm in maintaining
the BRANCH pointer, as commits done in this state need to be manually merged in order
to get into the branch, in the same way as detached head works currently.
next prev parent reply other threads:[~2007-12-04 21:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-04 20:08 [RFC] Introduce .git/BRANCH to point to the current branch Salikh Zakirov
2007-12-04 20:19 ` Matthieu Moy
2007-12-04 20:42 ` Jakub Narebski
2007-12-04 20:46 ` Junio C Hamano
2007-12-04 21:32 ` Matthieu Moy
2007-12-04 21:48 ` Junio C Hamano
2007-12-04 22:04 ` [PATCH] git-checkout --push/--pop Nanako Shiraishi
2007-12-05 6:59 ` Junio C Hamano
2007-12-05 10:26 ` Matthieu Moy
2007-12-05 17:44 ` David Kågedal
2007-12-06 23:39 ` [RFC] Introduce .git/BRANCH to point to the current branch Robin Rosenberg
2007-12-04 21:57 ` Salikh Zakirov [this message]
2007-12-04 22:06 ` Junio C Hamano
2007-12-04 22:08 ` Jakub Narebski
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=4755CD32.7040204@gmail.com \
--to=salikh@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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.
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 NNTP newsgroup(s).