vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Merge pull request #1215 from knedlsepp/fix-hydra-with-latest-git

Browse source 
scmdiff: Hardcode `--git-dir`
This commit is contained in:
Eelco Dolstra 2022-11-24 12:04:23 +01:00 committed by GitHub
parent d4d20f6484 b6ea85a601
commit 14d4624dc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/Hydra/Controller/API.pm
View file

@ -216,8 +216,8 @@ sub scmdiff : Path('/api/scmdiff') Args(0) {
} elsif ($type eq "git") { } elsif ($type eq "git") {
my $clonePath = getSCMCacheDir . "/git/" . sha256_hex($uri); my $clonePath = getSCMCacheDir . "/git/" . sha256_hex($uri);
die if ! -d $clonePath; die if ! -d $clonePath;
$diff .= `(cd $clonePath; git log $rev1..$rev2)`; $diff .= `(cd $clonePath; git --git-dir .git log $rev1..$rev2)`;
$diff .= `(cd $clonePath; git diff $rev1..$rev2)`; $diff .= `(cd $clonePath; git --git-dir .git diff $rev1..$rev2)`;
} }
$c->stash->{'plain'} = { data => (scalar $diff) || " " }; $c->stash->{'plain'} = { data => (scalar $diff) || " " };