Skip to content

Stop using unencrypted git protocol in build.gradle #36330

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

Merged
merged 1 commit into from
Sep 13, 2021

Conversation

akoeplinger
Copy link
Member

@ghost ghost added the area-signalr Includes: SignalR clients and servers label Sep 9, 2021
@BrennanConroy
Copy link
Member

/backport to release/6.0

@github-actions
Copy link
Contributor

Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1230647551

@BrennanConroy
Copy link
Member

/backport to release/5.0

@github-actions
Copy link
Contributor

Started backporting to release/5.0: https://github.com/dotnet/aspnetcore/actions/runs/1230650164

@github-actions
Copy link
Contributor

@BrennanConroy backporting to release/5.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Stop using unencrypted git protocol in build.gradle
Using index info to reconstruct a base tree...
M	src/SignalR/clients/java/signalr/core/build.gradle
M	src/SignalR/clients/java/signalr/messagepack/build.gradle
Falling back to patching base and 3-way merge...
Auto-merging src/SignalR/clients/java/signalr/messagepack/build.gradle
CONFLICT (content): Merge conflict in src/SignalR/clients/java/signalr/messagepack/build.gradle
Auto-merging src/SignalR/clients/java/signalr/core/build.gradle
CONFLICT (content): Merge conflict in src/SignalR/clients/java/signalr/core/build.gradle
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Stop using unencrypted git protocol in build.gradle
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

BrennanConroy added a commit that referenced this pull request Sep 13, 2021
BrennanConroy added a commit that referenced this pull request Sep 13, 2021
@BrennanConroy BrennanConroy merged commit 95403c7 into dotnet:main Sep 13, 2021
@ghost ghost added this to the 7.0-preview1 milestone Sep 13, 2021
@akoeplinger akoeplinger deleted the unauthenticated-git branch September 29, 2021 10:53
dougbu pushed a commit that referenced this pull request Oct 5, 2021
* Update build.gradle

Backport of #36330

* Update build.gradle
dougbu pushed a commit that referenced this pull request Oct 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-signalr Includes: SignalR clients and servers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants