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

Set 'ref' properly for local trees

Browse source
This commit is contained in:
Eelco Dolstra 2020-02-04 21:55:57 +01:00
parent fa467de090
commit e2213d77a2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/fetchers/git.cc
View file

@ -23,6 +23,11 @@ static Path getCacheInfoPathFor(const std::string & name, const Hash & rev)
return cacheDir + "/" + linkName + ".link"; return cacheDir + "/" + linkName + ".link";
} }
static std::string readHead(const Path & path)
{
return chomp(runProgram("git", true, { "-C", path, "rev-parse", "--abbrev-ref", "HEAD" }));
}
static void cacheGitInfo( static void cacheGitInfo(
Store & store, Store & store,
const std::string & name, const std::string & name,
@ -268,7 +273,7 @@ struct GitInput : Input
} }
} }
if (!input->ref) input->ref = isLocal ? "HEAD" : "master"; if (!input->ref) input->ref = isLocal ? readHead(actualUrl) : "master";
Path repoDir; Path repoDir;