Skip to content

fix: honor repo depth setting in gitSourceHasChanges and fetch functions (cherry-pick #27838 for 3.3)#28065

Merged
blakepettersson merged 1 commit into
argoproj:release-3.3from
alexandresavicki:cherry-pick-27838-to-release-3.3
May 30, 2026
Merged

fix: honor repo depth setting in gitSourceHasChanges and fetch functions (cherry-pick #27838 for 3.3)#28065
blakepettersson merged 1 commit into
argoproj:release-3.3from
alexandresavicki:cherry-pick-27838-to-release-3.3

Conversation

@alexandresavicki
Copy link
Copy Markdown
Contributor

@alexandresavicki alexandresavicki commented May 29, 2026

Cherry pick of #27838 to release-3.3.

The automatic cherry-pick failed due to a merge conflict in reposerver/repository/repository.go caused by structural differences between master and release-3.3 (the repoLock.Lock callback signature and checkoutRevision parameters differ between branches).

The conflict was resolved by adapting the fix to the release-3.3 code structure:

  • checkoutRevision(gitClient, revision, false, 0)checkoutRevision(gitClient, revision, false, repo.Depth)
  • s.fetch(gitClient, []string{syncedRevision})s.fetch(gitClient, []string{syncedRevision}, repo.Depth)

@alexandresavicki alexandresavicki requested a review from a team as a code owner May 29, 2026 15:55
…ons (argoproj#27838)

Signed-off-by: alexandresavicki <alexandre.savicki@quintoandar.com.br>
Co-authored-by: Cursor <cursoragent@cursor.com>
@alexandresavicki alexandresavicki force-pushed the cherry-pick-27838-to-release-3.3 branch from e42277f to 77465f0 Compare May 29, 2026 15:58
@alexandresavicki
Copy link
Copy Markdown
Contributor Author

Hey @blakepettersson, this is a manual cherry-pick of #27838 to release-3.3 (the automatic one failed due to merge conflicts). Could you review and merge when you get a chance? Thanks!

@codecov
Copy link
Copy Markdown

codecov Bot commented May 29, 2026

Codecov Report

❌ Patch coverage is 90.90909% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 62.92%. Comparing base (6d68924) to head (77465f0).

Files with missing lines Patch % Lines
reposerver/repository/repository.go 90.90% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           release-3.3   #28065      +/-   ##
===============================================
+ Coverage        62.91%   62.92%   +0.01%     
===============================================
  Files              353      353              
  Lines            50327    50333       +6     
===============================================
+ Hits             31661    31673      +12     
+ Misses           15632    15621      -11     
- Partials          3034     3039       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@blakepettersson blakepettersson merged commit 703ad3f into argoproj:release-3.3 May 30, 2026
22 checks passed
@alexandresavicki
Copy link
Copy Markdown
Contributor Author

Thanks for the merge @blakepettersson! Any chance a v3.3.12 patch release could be cut soon? We're waiting on this fix to properly use shallow clones in our setup. Happy to help if there's anything needed from my side.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants