Skip to content

Commit 46fa371

Browse files
committed
revert to old way
1 parent ff0954a commit 46fa371

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

services/gitdiff/gitdiff.go

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -503,11 +503,6 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader, ski
503503
}
504504
return diff, err
505505
}
506-
507-
prepareValue := func(s, p string) string {
508-
return strings.TrimSpace(strings.TrimPrefix(s, p))
509-
}
510-
511506
parsingLoop:
512507
for {
513508
// 1. A patch file always begins with `diff --git ` + `a/path b/path` (possibly quoted)
@@ -592,49 +587,48 @@ parsingLoop:
592587
}
593588
break parsingLoop
594589
}
595-
596590
switch {
597591
case strings.HasPrefix(line, cmdDiffHead):
598592
break curFileLoop
599593
case strings.HasPrefix(line, "old mode ") ||
600594
strings.HasPrefix(line, "new mode "):
601595

602596
if strings.HasPrefix(line, "old mode ") {
603-
curFile.OldMode = prepareValue(line, "old mode ")
597+
curFile.OldMode = line[len("old mode ") : len(line)-1]
604598
}
605599
if strings.HasPrefix(line, "new mode ") {
606-
curFile.Mode = prepareValue(line, "new mode ")
600+
curFile.Mode = line[len("new mode ") : len(line)-1]
607601
}
608602

609603
if strings.HasSuffix(line, " 160000\n") {
610604
curFile.IsSubmodule = true
611605
}
612606
case strings.HasPrefix(line, "new file mode "):
613-
curFile.Mode = strings.TrimPrefix(line, "new file mode ")
607+
curFile.Mode = line[len("new file mode ") : len(line)-1]
614608
case strings.HasPrefix(line, "rename from "):
615609
curFile.IsRenamed = true
616610
curFile.Type = DiffFileRename
617611
if curFile.IsAmbiguous {
618-
curFile.OldName = prepareValue(line, "rename from ")
612+
curFile.OldName = line[len("rename from ") : len(line)-1]
619613
}
620614
case strings.HasPrefix(line, "rename to "):
621615
curFile.IsRenamed = true
622616
curFile.Type = DiffFileRename
623617
if curFile.IsAmbiguous {
624-
curFile.Name = prepareValue(line, "rename to ")
618+
curFile.Name = line[len("rename to ") : len(line)-1]
625619
curFile.IsAmbiguous = false
626620
}
627621
case strings.HasPrefix(line, "copy from "):
628622
curFile.IsRenamed = true
629623
curFile.Type = DiffFileCopy
630624
if curFile.IsAmbiguous {
631-
curFile.OldName = prepareValue(line, "copy from ")
625+
curFile.OldName = line[len("copy from ") : len(line)-1]
632626
}
633627
case strings.HasPrefix(line, "copy to "):
634628
curFile.IsRenamed = true
635629
curFile.Type = DiffFileCopy
636630
if curFile.IsAmbiguous {
637-
curFile.Name = prepareValue(line, "copy to ")
631+
curFile.Name = line[len("copy to ") : len(line)-1]
638632
curFile.IsAmbiguous = false
639633
}
640634
case strings.HasPrefix(line, "new file"):

0 commit comments

Comments
 (0)