Skip to content
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.

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

fix: CMPv2 does not allow symlinks to adjacent files in same git repo. Fixes #13342 (cherry-pick #13360) #13669

Merged
merged 1 commit into from
May 27, 2023

Conversation

gcp-cherry-pick-bot[bot]
Copy link

Cherry-picked fix: CMPv2 does not allow symlinks to adjacent files in same git repo. Fixes #13342 (#13360)

fix: CMPv2 does not allow symlinks to adjacent files in same git repo. Fixes #13342 (#13360)

Signed-off-by: Jiacheng Xu xjcmaxwellcjx@gmail.com

…Fixes #13342 (#13360)

fix: CMPv2 does not allow symlinks to adjacent files in same git repo. Fixes #13342 (#13360)

Signed-off-by: Jiacheng Xu <xjcmaxwellcjx@gmail.com>
@codecov
Copy link

codecov bot commented May 19, 2023

Codecov Report

Patch coverage: 63.63% and project coverage change: -0.01 ⚠️

Comparison is base (3778173) 49.03% compared to head (32d3005) 49.02%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-2.7   #13669      +/-   ##
===============================================
- Coverage        49.03%   49.02%   -0.01%     
===============================================
  Files              246      246              
  Lines            42592    42592              
===============================================
- Hits             20885    20882       -3     
- Misses           19592    19594       +2     
- Partials          2115     2116       +1     
Impacted Files Coverage Δ
util/app/discovery/discovery.go 34.78% <53.84%> (ø)
reposerver/repository/repository.go 60.42% <75.00%> (ø)
util/cmp/stream.go 50.94% <100.00%> (ø)

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@crenshaw-dev crenshaw-dev merged commit b3f0979 into release-2.7 May 27, 2023
20 of 23 checks passed
@crenshaw-dev crenshaw-dev deleted the cherry-pick-651874-release-2.7 branch May 27, 2023 16:31
schakrad pushed a commit to schakrad/argo-cd that referenced this pull request Jul 24, 2023
…Fixes argoproj#13342 (argoproj#13360) (argoproj#13669)

fix: CMPv2 does not allow symlinks to adjacent files in same git repo. Fixes argoproj#13342 (argoproj#13360)

Signed-off-by: Jiacheng Xu <xjcmaxwellcjx@gmail.com>
Co-authored-by: Jiacheng Xu <xjcmaxwellcjx@gmail.com>
Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com>
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.

None yet

2 participants