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

Add some progress indication when fetching submodules

Browse source
This commit is contained in:
Eelco Dolstra 2023-02-03 21:42:42 +01:00
parent 0d73313c55
commit 81e75e4bf6
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libfetchers/git.cc
View file

@ -615,15 +615,24 @@ struct GitInputScheme : InputScheme
AutoDelete delTmpGitDir(tmpGitDir, true); AutoDelete delTmpGitDir(tmpGitDir, true);
runProgram("git", true, { "-c", "init.defaultBranch=" + gitInitialBranch, "init", tmpDir, "--separate-git-dir", tmpGitDir }); runProgram("git", true, { "-c", "init.defaultBranch=" + gitInitialBranch, "init", tmpDir, "--separate-git-dir", tmpGitDir });
// TODO: repoDir might lack the ref (it only checks if rev
// exists, see FIXME above) so use a big hammer and fetch {
// everything to ensure we get the rev. // TODO: repoDir might lack the ref (it only checks if rev
runProgram("git", true, { "-C", tmpDir, "fetch", "--quiet", "--force", // exists, see FIXME above) so use a big hammer and fetch
"--update-head-ok", "--", repoDir, "refs/*:refs/*" }); // everything to ensure we get the rev.
Activity act(*logger, lvlTalkative, actUnknown, fmt("making temporary clone of '%s'", tmpDir));
runProgram("git", true, { "-C", tmpDir, "fetch", "--quiet", "--force",
"--update-head-ok", "--", repoDir, "refs/*:refs/*" });
}
runProgram("git", true, { "-C", tmpDir, "checkout", "--quiet", input.getRev()->gitRev() }); runProgram("git", true, { "-C", tmpDir, "checkout", "--quiet", input.getRev()->gitRev() });
runProgram("git", true, { "-C", tmpDir, "remote", "add", "origin", actualUrl }); runProgram("git", true, { "-C", tmpDir, "remote", "add", "origin", actualUrl });
runProgram("git", true, { "-C", tmpDir, "submodule", "--quiet", "update", "--init", "--recursive" });
{
Activity act(*logger, lvlTalkative, actUnknown, fmt("fetching submodules of '%s'", tmpDir));
runProgram("git", true, { "-C", tmpDir, "submodule", "--quiet", "update", "--init", "--recursive" });
}
filter = isNotDotGitDirectory; filter = isNotDotGitDirectory;
} else { } else {