Thread (7 messages) flat view 7 messages, 3 authors, 2016-06-15

Re: [PATCH RESEND] Git.pm: Set GIT_WORK_TREE if we set GIT_DIR

From: Petr Baudis <hidden>
Date: 2016-06-15 22:46:43

On Thu, May 07, 2009 at 03:41:27PM +0200, Frank Lichtenheld wrote:
quoted hunk ↗ jump to hunk
From: Frank Lichtenheld <redacted>

Otherwise git will use the current directory as work tree which will
lead to unexpected results if we operate in sub directory of the
work tree.

Signed-off-by: Frank Lichtenheld <redacted>
---
 perl/Git.pm         |    2 ++
 t/t9700-perl-git.sh |    4 ++++
 t/t9700/test.pl     |   13 +++++++++++++
 3 files changed, 19 insertions(+), 0 deletions(-)

No comments and doesn't seem to have been applied, so resent unchanged.
diff --git a/perl/Git.pm b/perl/Git.pm
index 291ff5b..4313db7 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1280,6 +1280,8 @@ sub _cmd_exec {
 	my ($self, @args) = @_;
 	if ($self) {
 		$self->repo_path() and $ENV{'GIT_DIR'} = $self->repo_path();
+		$self->repo_path() and $self->wc_path()
+			and $ENV{'GIT_WORK_TREE'} = $self->wc_path();
 		$self->wc_path() and chdir($self->wc_path());
 		$self->wc_subdir() and chdir($self->wc_subdir());
 	}
This looks obviously correct?

You could even skip the first chdir and use $self->wc_path() .
$self->wc_subdir() in the second one to save a syscall, I guess. ;-)

I've really forgot most of the code already so it's not worth much, but

Acked-by: Petr Baudis <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help