Git.pm: Set GIT_WORK_TREE if we set GIT_DIR

flichtenheld · gitster · commit da159c775941 · 2009-05-09T08:25:55.000-07:00
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 &lt;flichtenheld@astaro.com&gt;
Acked-by: Petr Baudis &lt;pasky@suse.cz&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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());
 	}
diff --git a/t/t9700-perl-git.sh b/t/t9700-perl-git.sh
@@ -29,6 +29,10 @@ test_expect_success \
      git add . &&
      git commit -m "first commit" &&
 
+     echo "new file in subdir 2" > directory2/file2 &&
+     git add . &&
+     git commit -m "commit in directory2" &&
+
      echo "changed file 1" > file1 &&
      git commit -a -m "second commit" &&
 
diff --git a/t/t9700/test.pl b/t/t9700/test.pl
@@ -98,3 +98,16 @@
 	todo_skip 'config after wc_chdir', 1;
 	is($r->config("color.string"), "value", "config after wc_chdir");
 }
+
+# Object generation in sub directory
+chdir("directory2");
+my $r2 = Git->repository();
+is($r2->repo_path, $abs_repo_dir . "/.git", "repo_path (2)");
+is($r2->wc_path, $abs_repo_dir . "/", "wc_path (2)");
+is($r2->wc_subdir, "directory2/", "wc_subdir initial (2)");
+
+# commands in sub directory
+my $last_commit = $r2->command_oneline(qw(rev-parse --verify HEAD));
+like($last_commit, qr/^[0-9a-fA-F]{40}$/, 'rev-parse returned hash');
+my $dir_commit = $r2->command_oneline('log', '-n1', '--pretty=format:%H', '.');
+isnt($last_commit, $dir_commit, 'log . does not show last commit');

Original file line number	Diff line number	Diff line change
`@@ -1280,6 +1280,8 @@ sub _cmd_exec {`
`1280`	`1280`	`my ($self, @args) = @_;`
`1281`	`1281`	`if ($self) {`
`1282`	`1282`	`$self->repo_path() and $ENV{'GIT_DIR'} = $self->repo_path();`
	`1283`	`+ $self->repo_path() and $self->wc_path()`
	`1284`	`+ and $ENV{'GIT_WORK_TREE'} = $self->wc_path();`
`1283`	`1285`	`$self->wc_path() and chdir($self->wc_path());`
`1284`	`1286`	`$self->wc_subdir() and chdir($self->wc_subdir());`
`1285`	`1287`	`}`