This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 9d3987ae authored by Daniel Crazzolara's avatar Daniel Crazzolara
Browse files

Ignoring .git submodules when extracting zip

parent 2b0c78b0
Branches
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
......@@ -123,6 +123,9 @@ public class ExerciseService {
// https://www.baeldung.com/java-compress-and-uncompress
while ((zipEntry = zipInputStream.getNextEntry()) != null) {
if (zipEntry.getName().contains("/.git/")) { // important as Artemis exercises come in submodules
continue;
}
File entryFile = new File(tmpDir, zipEntry.getName());
if (zipEntry.isDirectory()) {
......
......@@ -220,7 +220,7 @@ public class GitlabService {
FileUtils.copyDirectory(srcDir, git.getRepository().getDirectory().getParentFile());
git.add().addFilepattern(".").call();
git.commit().setMessage("Importing files").setCommitter(currentUser.getUsername(), currentUser.getEmail()).call();
git.commit().setAll(true).setMessage("Importing files").setCommitter(currentUser.getUsername(), currentUser.getEmail()).call();
git.push().setCredentialsProvider(CredentialsProvider.getDefault()).call();
} catch (GitLabApiException | GitAPIException e) {
FileUtils.deleteDirectory(git.getRepository().getDirectory().getParentFile());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment