Skip to content

chore: main sync 7/7 #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikramdevtron merged 3 commits into from
Jul 7, 2025
Merged

chore: main sync 7/7 #311

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1addb48
fix ssh with single commit
iamayushm Jul 1, 2025
8e4eeb6
Merge pull request #304 from devtron-labs/fix-ssh
iamayushm Jul 3, 2025
15f8ef1
Merge branch 'main' into main-sync-7-7
Shivam-nagar23 Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion git-sensor/pkg/git/RepositoryManager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,11 @@ func (impl *RepositoryManagerImpl) Fetch(gitCtx GitContext, url string, location
res, errMsg, err := impl.gitManager.Fetch(gitCtx, location)

if err == nil && len(res) > 0 {
onlySSHWarning := IsOutputOnlySSHWarning(res)
impl.logger.Infow("repository updated", "location", url)
//updated
middleware.GitPullDuration.WithLabelValues("true", "true").Observe(time.Since(start).Seconds())
return true, r, "", nil
return !onlySSHWarning, r, "", nil
} else if err == nil && len(res) == 0 {
impl.logger.Debugw("no update for ", "path", url)
middleware.GitPullDuration.WithLabelValues("true", "false").Observe(time.Since(start).Seconds())
Expand All @@ -263,6 +264,19 @@ func (impl *RepositoryManagerImpl) Fetch(gitCtx GitContext, url string, location

}

func IsOutputOnlySSHWarning(output string) bool {
outputSplit := strings.Split(output, "\n")
if len(outputSplit) > 1 {
return false
}
for _, line := range outputSplit {
if strings.Contains(line, "Warning: Permanently added") {
return true
}
}
return false
}

func (impl *RepositoryManagerImpl) GetCommitForTag(gitCtx GitContext, checkoutPath, tag string) (*GitCommitBase, error) {
var err error
start := time.Now()
Expand Down