From: "Nguyen Thai Ngoc Duy" <pclouds@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/9] Make setup_work_tree() return new prefix
Date: Thu, 28 Feb 2008 20:02:58 +0700 [thread overview]
Message-ID: <fcaeb9bf0802280502m2cfc967bt792be98d81a2996@mail.gmail.com> (raw)
In-Reply-To: <alpine.LSU.1.00.0802281130140.22527@racer.site>
On Thu, Feb 28, 2008 at 6:30 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
>
>
> On Wed, 27 Feb 2008, Nguyễn Thái Ngọc Duy wrote:
>
> > @@ -336,24 +321,21 @@ const char *setup_git_directory_gently(int *nongit_ok)
> > static char buffer[1024 + 1];
> > const char *retval;
> >
> > + /*
> > + * The old behaviour (which we retain here) is to set
> > + * the work tree root to the cwd, unless overridden by
> > + * the config, the command line, or GIT_WORK_TREE.
> > + */
> > if (!work_tree_env) {
> > - retval = set_work_tree(gitdirenv);
> > - /* config may override worktree */
> > - if (check_repository_format_gently(nongit_ok))
> > - return NULL;
> > - return retval;
> > + char buffer[PATH_MAX + 1];
> > +
> > + if (!getcwd(buffer, sizeof(buffer)))
> > + die ("Could not get the current working directory");
> > + git_work_tree_cfg = xstrdup(buffer);
> > + inside_work_tree = 1;
> > }
> > - if (check_repository_format_gently(nongit_ok))
> > - return NULL;
> > - retval = get_relative_cwd(buffer, sizeof(buffer) - 1,
> > - get_git_work_tree());
> > - if (!retval || !*retval)
> > - return NULL;
> > - set_git_dir(make_absolute_path(gitdirenv));
> > - if (chdir(work_tree_env) < 0)
> > - die ("Could not chdir to %s", work_tree_env);
> > - strcat(buffer, "/");
> > - return retval;
> > + check_repository_format_gently(nongit_ok);
> > + return NULL;
>
> What about the situation where you are in a subdirectory of core.worktree?
> You return prefix NULL? That's wrong.
This is an intermediate patch. At the end of the series, you will see
that _gently() does not return prefix. I split it for easier review.
> I am sorry, but with all these intrusive changes, I get a very uneasy
> feeling. As uneasy as with the original series, which I tried to fix up,
> not really succeeding.
In constrast I feel good :) To me setup_git_directory*() at the end
look really nice. No chdir() all over the place
(temporary chdir() for detecting .git does not count). It also gives a
chance to get rid of worktree to commands that do not care about
worktree at all.
> Ciao,
> Dscho
>
--
Duy
next prev parent reply other threads:[~2008-02-28 13:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1204130175.git.pclouds@gmail.com>
2008-02-27 16:38 ` [PATCH 1/9] "git read-tree -m" and the like require worktree Nguyễn Thái Ngọc Duy
2008-02-28 0:48 ` Junio C Hamano
2008-02-28 3:22 ` Nguyen Thai Ngoc Duy
2008-02-27 16:38 ` [PATCH 2/9] Make sure setup_git_directory is called before accessing repository Nguyễn Thái Ngọc Duy
2008-02-27 16:38 ` [PATCH 3/9] Make get_git_dir() and 'git rev-parse --git-dir' absolute path Nguyễn Thái Ngọc Duy
2008-02-27 16:39 ` [PATCH 4/9] Make setup_work_tree() return new prefix Nguyễn Thái Ngọc Duy
2008-02-28 11:30 ` Johannes Schindelin
2008-02-28 13:02 ` Nguyen Thai Ngoc Duy [this message]
2008-02-28 15:53 ` Johannes Schindelin
2008-02-27 16:39 ` [PATCH 5/9] http-push: Avoid calling setup_git_directory() twice Nguyễn Thái Ngọc Duy
2008-02-28 0:50 ` Junio C Hamano
2008-02-28 3:26 ` Nguyen Thai Ngoc Duy
2008-02-27 16:39 ` [PATCH 6/9] Completely move out worktree setup from setup_git_directory_gently() Nguyễn Thái Ngọc Duy
2008-02-28 2:17 ` Junio C Hamano
2008-02-28 3:31 ` Nguyen Thai Ngoc Duy
2008-02-28 3:37 ` Junio C Hamano
2008-02-28 4:09 ` Nguyen Thai Ngoc Duy
2008-02-28 11:26 ` Johannes Schindelin
2008-02-28 12:52 ` Nguyen Thai Ngoc Duy
2008-02-27 16:40 ` [PATCH 7/9] builtin-archive: mark unused prefix "unused_prefix" Nguyễn Thái Ngọc Duy
2008-02-27 16:40 ` [PATCH 8/9] Make setup_git_directory() auto-setup worktree if found Nguyễn Thái Ngọc Duy
2008-02-27 16:40 ` [PATCH 9/9] Documentation: update api-builtin and api-setup Nguyễn Thái Ngọc Duy
2011-04-05 8:07 ` Jonathan Nieder
2011-04-05 11:32 ` Nguyen Thai Ngoc Duy
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fcaeb9bf0802280502m2cfc967bt792be98d81a2996@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.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 public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).