[PATCH] git diff/diff-index/diff-files: call setup_work_tree()
- From
Miklos Vajna <vmiklos@frugalware.org>
- Date
- Aug 25, 2008, 14:43 UTC
- Message-ID
- <1219675383-1717-1-git-send-email-vmiklos@frugalware.org>
- In-Reply-To
- <fcaeb9bf0808250652p3d0f483dt714cd68d3122d7c9@mail.gmail.com>
This makes it possible to use git diff when we are outside the repo but --work-tree and --git-dir is used.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> ---
On Mon, Aug 25, 2008 at 08:52:11PM +0700, Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:
> Because "git diff" did not call setup_work_tree(). The same happens > for "git diff-index" that someone reported recently. IIRC "git > diff-files" has the same problem.
Thanks, that was the problem.
builtin-diff-files.c | 1 + builtin-diff-index.c | 1 + builtin-diff.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/builtin-diff-files.c b/builtin-diff-files.c index 9bf10bb..4802e00 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -19,6 +19,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) int result; unsigned options = 0; + setup_work_tree(); init_revisions(&rev, prefix); git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ rev.abbrev = 0; 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; 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.
-- 1.6.0.rc3.17.gc14c8.dirty