Skip to content

Commit 5242bfb

Browse files
committed
fix AbstractGitMirror
1 parent 7cff6b3 commit 5242bfb

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

server-mirror-git/src/main/java/com/linecorp/centraldogma/server/internal/mirror/AbstractGitMirror.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ MirrorResult mirrorRemoteToLocal(
317317
if (!path.startsWith(remotePath())) {
318318
continue;
319319
}
320+
if (path.endsWith("/.gitmodules")) {
321+
// Submodules are not supported.
322+
continue;
323+
}
320324

321325
final String localPath = localPath() + path.substring(remotePath().length());
322326

@@ -634,14 +638,13 @@ private static long applyPathEdit(DirCache dirCache, ObjectInserter inserter, St
634638
switch (EntryType.guessFromPath(pathString)) {
635639
case JSON:
636640
case YAML:
637-
final String oldData = oldContent != null ? new String(oldContent, UTF_8) : null;
638-
final String newData = entry.rawContent();
641+
final String oldData = oldContent != null ? sanitizeText(new String(oldContent, UTF_8)) : null;
642+
final String newData = sanitizeText(entry.rawContent());
639643
assert newData != null;
640644
// Upsert only when the contents are really different.
641645
if (!newData.equals(oldData)) {
642-
final String newContent = newData + '\n';
643-
applyPathEdit(dirCache, new InsertText(pathString, inserter, newContent));
644-
return newContent.length();
646+
applyPathEdit(dirCache, new InsertText(pathString, inserter, newData));
647+
return newData.length();
645648
}
646649
break;
647650
case TEXT:

0 commit comments

Comments
 (0)