From: Junio C Hamano <gitster@pobox.com>
To: "Nguyen Thai Ngoc Duy" <pclouds@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: builtin command's prefix question
Date: Wed, 05 Dec 2007 15:22:55 -0800 [thread overview]
Message-ID: <7vk5nsloa8.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vlk88n648.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 05 Dec 2007 14:12:23 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> * I would say it is a misconfiguration if GIT_DIR is not set and
> GIT_WORK_TREE is, as the sole purpose of GIT_WORK_TREE is so that you
> can work from a subdirectory when you set GIT_DIR. I may be missing
> an obvious use case that this is useful, but I do not think of any.
> Dscho may be able to correct me on this, as he fixed up the original
> work tree series that was even messier quite a bit during the last
> round.
I had a short discussion with Dscho on this. One scenario that was
brought up was this.
You have a work tree of mixed contents that logically belong to
separate repository. Think $HOME/.?*, and tracking .vimrc and
.pinerc as separate "projects". You have $HOME/gits/vim.git and
$HOME/gits/pine.git bare-looking repositories.
The "kosher" way of doing this might be:
$ cd $HOME
$ GIT_WORK_TREE=$HOME; export GIT_WORK_TREE
$ edit .vimrc
$ GIT_DIR=gits/vim.git git commit .vimrc
$ edit .pinerc
$ GIT_DIR=gits/pine.git git commit .pinerc
However, if we define setup() to behave this way when GIT_DIR is not
defined and GIT_WORK_TREE is:
(1) internally pretend as if GIT_DIR was specified to be the
directory where the command was started from (iow, do getcwd()
once upon startup);
(2) chdir to GIT_WORK_TREE (which means "callers of setup() always
run from the top of the work tree");
(3) set prefix to NULL;
Then this workflow becomes possible:
$ cd $HOME
$ GIT_WORK_TREE=$HOME; export GIT_WORK_TREE
$ edit .vimrc .pinerc
$ cd $HOME/gits/vimrc.git && git commit .vimrc
$ cd $HOME/gits/pinerc.git && git commit .pinerc
I am not convinced this is giving any natural user experience, nor an
alternative:
$ cd $HOME
$ GIT_WORK_TREE=$HOME; export GIT_WORK_TREE
$ cd $HOME/gits/vimrc.git
$ edit $HOME/.vimrc
$ git commit .vimrc
$ cd $HOME/gits/pinerc.git
$ edit $HOME/.pinerc
$ git commit .pinerc
While I still think the combination is simply crazy and does not make
any sense, if enough users on the list agrees that it makes sense, I
wouldn't mind setup() did (1) to (3) mentioned above. The alternative
is simply to declare GIT_WORK_TREE without GIT_DIR is a nonsense and
either error error out or ignore GIT_WORK_TREE, which might be easier to
explain to people.
Opinions?
next prev parent reply other threads:[~2007-12-05 23:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-05 16:56 builtin command's prefix question Nguyen Thai Ngoc Duy
2007-12-05 22:12 ` Junio C Hamano
2007-12-05 23:22 ` Junio C Hamano [this message]
2007-12-05 23:43 ` Junio C Hamano
2007-12-06 15:26 ` Nguyen Thai Ngoc Duy
2007-12-06 15:48 ` Johannes Schindelin
2007-12-06 16:04 ` Junio C Hamano
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=7vk5nsloa8.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@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).