Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Conversation

peterguy
Copy link
Contributor

@peterguy peterguy commented Aug 9, 2023

Implemented suggestions to remove debug code, add test and fix typo

Test plan

gitdomain test will include a test of the newly-allowed git commit arguments

Implemented suggestions to remove debug code, add test and fix typo
@peterguy peterguy requested a review from eseliger August 9, 2023 17:12
@peterguy peterguy self-assigned this Aug 9, 2023
@cla-bot cla-bot bot added the cla-signed label Aug 9, 2023
Copy link
Member

@eseliger eseliger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@sourcegraph-bot
Copy link
Contributor

sourcegraph-bot commented Aug 9, 2023

Codenotify: Notifying subscribers in CODENOTIFY files for diff 632927a...1497747.

Notify File(s)
@indradhanush cmd/gitserver/server/patch.go
@sashaostrikov cmd/gitserver/server/patch.go

@peterguy peterguy enabled auto-merge (squash) August 9, 2023 17:21
@peterguy peterguy merged commit 3a9f503 into main Aug 9, 2023
@peterguy peterguy deleted the peterguy/followup-to-pr-55657 branch August 9, 2023 17:40
@github-actions
Copy link
Contributor

github-actions bot commented Aug 9, 2023

The backport to 5.1 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.1 5.1
# Navigate to the new working tree
cd .worktrees/backport-5.1
# Create a new branch
git switch --create backport-55682-to-5.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3a9f5030d6480df2bf7c50ef3bfd42d6aca34a52
# Push it to GitHub
git push --set-upstream origin backport-55682-to-5.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.1

Then, create a pull request where the base branch is 5.1 and the compare/head branch is backport-55682-to-5.1.

@github-actions github-actions bot added backports failed-backport-to-5.1 release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Aug 9, 2023
davejrt pushed a commit that referenced this pull request Aug 9, 2023
Implemented suggestions to remove debug code, add test and fix typo



## Test plan

gitdomain test will include a test of the newly-allowed `git commit`
arguments
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants