diff --git a/pom.xml b/pom.xml
index 2d7a5bc9..93a35bda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
fr.yodamad.svn2git
svn-2-git
- 1.18
+ 1.18.1
jar
Svn 2 GitLab
diff --git a/src/main/java/fr/yodamad/svn2git/service/Cleaner.java b/src/main/java/fr/yodamad/svn2git/service/Cleaner.java
index 60f33acc..82364128 100644
--- a/src/main/java/fr/yodamad/svn2git/service/Cleaner.java
+++ b/src/main/java/fr/yodamad/svn2git/service/Cleaner.java
@@ -80,6 +80,8 @@ public Cleaner(final HistoryManager historyManager, final MigrationRemovedFileRe
*/
private static boolean isForbiddenExtension(WorkUnit workUnit, Path path) {
+ if (workUnit.migration.getForbiddenFileExtensions() == null) return false;
+
List extensions = Arrays.stream(workUnit.migration.getForbiddenFileExtensions().
split(",")).map(String::toLowerCase).collect(Collectors.toList());
diff --git a/src/main/java/fr/yodamad/svn2git/service/HistoryManager.java b/src/main/java/fr/yodamad/svn2git/service/HistoryManager.java
index 2ada102f..ab598908 100644
--- a/src/main/java/fr/yodamad/svn2git/service/HistoryManager.java
+++ b/src/main/java/fr/yodamad/svn2git/service/HistoryManager.java
@@ -63,9 +63,12 @@ public void endStep(MigrationHistory history, StatusEnum status, String data) {
history.setStatus(status);
if (data != null) history.setData(data);
- // Compute executionTime
- Long execution = Instant.now().toEpochMilli() - history.getStartTime().toEpochMilli();
- history.setExecutionTime(DateFormatter.toNiceFormat(execution));
+ if (history.getStartTime() == null) { history.setExecutionTime("N/A"); }
+ else {
+ // Compute executionTime
+ Long execution = Instant.now().toEpochMilli() - history.getStartTime().toEpochMilli();
+ history.setExecutionTime(DateFormatter.toNiceFormat(execution));
+ }
migrationHistoryRepository.save(history);
LOG.info(format("Finish step %s with status %s in %s", history.getStep(), status, history.getExecutionTime()));
diff --git a/src/main/java/fr/yodamad/svn2git/service/MigrationManager.java b/src/main/java/fr/yodamad/svn2git/service/MigrationManager.java
index e57e2a6f..448d2fa4 100644
--- a/src/main/java/fr/yodamad/svn2git/service/MigrationManager.java
+++ b/src/main/java/fr/yodamad/svn2git/service/MigrationManager.java
@@ -297,7 +297,7 @@ public void startMigration(final long migrationId, final boolean retry) {
gitCommand = "git add README.md";
execCommand(commandManager, workUnit.directory, gitCommand);
- gitCommand = "git commit -m \"Add generated README.md\"";
+ gitCommand = "git commit -m \"📃 Add generated README.md\"";
execCommand(commandManager, workUnit.directory, gitCommand);
gitCommand = format("%s --set-upstream origin master", GIT_PUSH);
execCommand(commandManager, workUnit.directory, gitCommand);
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index 9b7b433c..b683dd74 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -141,8 +141,8 @@ application:
uploadPauseMilliSeconds: 5000
gitlab:
url: http://localhost/
- account: TO_REPLACE
- token: TO_REPLACE
+ account: root
+ token: 1uCYVVdwB32yCy4sB-2w
credentials: optional
waitSeconds: 15
dynamic-local-config[0]: pack.deltaCacheSize 256m,Limiting deltaCacheSize to 256m (default)