Skip to content

Commit

Permalink
Log error branch
Browse files Browse the repository at this point in the history
  • Loading branch information
rcowham committed Feb 2, 2023
1 parent 3ea1886 commit 11ae1a4
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@ func (g *GitP4Transfer) validateCommit(cmt *GitCommit) {
if gf.action == modify {
newfiles = append(newfiles, gf)
} else if gf.action == delete {
if node.findFile(gf.name) {
if node.findFile(gf.name) { // Single file found
newfiles = append(newfiles, gf)
continue
}
Expand All @@ -1139,6 +1139,8 @@ func (g *GitP4Transfer) validateCommit(cmt *GitCommit) {
g.logger.Debugf("DirFileDelete: %s Path:%s", cmt.ref(), df)
newfiles = append(newfiles, newGitFile(&GitFile{name: df, action: delete, logger: g.logger}))
}
} else {
g.logger.Debugf("DeleteIgnored: %s Path:%s", cmt.ref(), gf.name)
}
} else if gf.action == rename {
if node.findFile(gf.srcName) {
Expand All @@ -1157,6 +1159,8 @@ func (g *GitP4Transfer) validateCommit(cmt *GitCommit) {
g.logger.Debugf("DirFileRename: %s Src:%s Dst:%s", cmt.ref(), rf, dest)
newfiles = append(newfiles, newGitFile(&GitFile{name: dest, srcName: rf, action: rename, logger: g.logger}))
}
} else {
g.logger.Debugf("RenameIgnored: %s Src:%s Dst:%s", cmt.ref(), gf.srcName, gf.name)
}
} else if gf.action == copy {
if node.findFile(gf.name) {
Expand All @@ -1175,6 +1179,8 @@ func (g *GitP4Transfer) validateCommit(cmt *GitCommit) {
g.logger.Debugf("DirFileCopy: %s Src:%s Dst:%s", cmt.ref(), rf, dest)
newfiles = append(newfiles, newGitFile(&GitFile{name: dest, srcName: rf, action: copy, logger: g.logger}))
}
} else {
g.logger.Debugf("CopyIgnored: %s Src:%s Dst:%s", cmt.ref(), gf.srcName, gf.name)
}
} else {
g.logger.Errorf("Unexpected GFAction: GitFile: %s ID %d, %s, %s", cmt.ref(), gf.ID, gf.name, gf.action.String())
Expand Down

0 comments on commit 11ae1a4

Please sign in to comment.