@@ -14,8 +14,6 @@ import (
14
14
"strings"
15
15
"time"
16
16
17
- "github.com/go-git/go-git/v5/plumbing"
18
-
19
17
javaParser "github.com/actiontech/java-sql-extractor/parser"
20
18
xmlParser "github.com/actiontech/mybatis-mapper-2-sql"
21
19
"github.com/actiontech/sqle/sqle/api/controller"
@@ -28,7 +26,6 @@ import (
28
26
"github.com/actiontech/sqle/sqle/model"
29
27
"github.com/actiontech/sqle/sqle/server"
30
28
"github.com/actiontech/sqle/sqle/utils"
31
- goGit "github.com/go-git/go-git/v5"
32
29
"github.com/labstack/echo/v4"
33
30
)
34
31
@@ -442,28 +439,14 @@ func parseXMLsWithFilePath(xmlContents []xmlParser.XmlFile) ([]SQLFromXML, error
442
439
// todo 此处跳过了不支持的编码格式文件
443
440
func getSqlsFromGit (c echo.Context ) (sqlsFromSQLFiles , sqlsFromJavaFiles []SQLsFromSQLFile , sqlsFromXMLs []SQLFromXML , exist bool , err error ) {
444
441
// clone from git
445
- repository , directory , cleanup , err := CloneGitRepository (c .Request ().Context (), c .FormValue (GitHttpURL ), c .FormValue (GitUserName ), c .FormValue (GitPassword ), c .FormValue (GitBranchName ))
442
+ _ , directory , cleanup , err := CloneGitRepository (c .Request ().Context (), c .FormValue (GitHttpURL ), c .FormValue (GitUserName ), c .FormValue (GitPassword ), c .FormValue (GitBranchName ))
446
443
if err != nil {
447
444
return nil , nil , nil , false , err
448
445
}
449
446
defer func () {
450
447
cleanupError := cleanup ()
451
448
c .Logger ().Errorf ("cleanup git repository failed, err: %v" , cleanupError )
452
449
}()
453
- workTree , err := repository .Worktree ()
454
- if err != nil {
455
- return nil , nil , nil , false , err
456
- }
457
- branch := c .FormValue (GitBranchName )
458
- if branch != "" {
459
- err = workTree .Checkout (& goGit.CheckoutOptions {
460
- Branch : plumbing .NewRemoteReferenceName ("" , branch ),
461
- Create : false ,
462
- })
463
- if err != nil {
464
- return nil , nil , nil , false , err
465
- }
466
- }
467
450
l := log .NewEntry ().WithField ("function" , "getSqlsFromGit" )
468
451
var xmlContents []xmlParser.XmlFile
469
452
// traverse the repository, parse and put SQL into sqlBuffer
0 commit comments