From: Miklos Vajna <vmiklos@frugalware.org>
Date: Mon, 25 Aug 2008 14:50:44 GMT
Subject: Re: [PATCH] git diff/diff-index/diff-files: call setup_work_tree()
Message-ID: <20080825145044.GE23800@genesis.frugalware.org>
In-Reply-To: <fcaeb9bf0808250746q3366b9cap78c45718287fba80@mail.gmail.com>

On Mon, Aug 25, 2008 at 09:46:37PM +0700, Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:
> On 8/25/08, Miklos Vajna <vmiklos@frugalware.org> wrote:
> >  diff --git a/builtin-diff-index.c b/builtin-diff-index.c
> >  index 17d851b..b8e0656 100644
> >  --- a/builtin-diff-index.c
> >  +++ b/builtin-diff-index.c
> >  @@ -16,6 +16,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
> >         int i;
> >         int result;
> >
> >  +       setup_work_tree();
> >         init_revisions(&rev, prefix);
> >         git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
> >         rev.abbrev = 0;
> 
> I think this is only needed when cached == 0
> 
> >  diff --git a/builtin-diff.c b/builtin-diff.c
> >  index 7ffea97..86f9255 100644
> >  --- a/builtin-diff.c
> >  +++ b/builtin-diff.c
> >  @@ -244,6 +244,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
> >         int nongit;
> >         int result = 0;
> >
> >  +       setup_work_tree();
> >         /*
> >          * We could get N tree-ish in the rev.pending_objects list.
> >          * Also there could be M blobs there, and P pathspecs.
> >
> 
> No. git-diff has too many modes, some does not need worktree. This
> forces worktree on all modes.

Ah, yes. I just wanted to say that I forgot do a 'make test' and
actually this breaks at least t0020-crlf.sh. I'll post a fixed patch in
a bit.

Sorry.