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.

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

Jump to bottom

Fix dirty branch error for operations on uncommitted data instead of conflict #4463

Merged
merged 5 commits into from Oct 26, 2022
Merged

Fix dirty branch error for operations on uncommitted data instead of conflict #4463

merged 5 commits into from Oct 26, 2022

Conversation

nopcoder
Copy link
Contributor

Fix #4456

@nopcoder nopcoder added the include-changelog PR description should be included in next release changelog label Oct 25, 2022
@nopcoder nopcoder self-assigned this Oct 25, 2022
itaiad200
itaiad200 requested changes Oct 26, 2022
View reviewed changes
Copy link
Contributor

@itaiad200 itaiad200 left a comment

Choose a reason for hiding this comment

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

Some comments:

  1. Let's remove AddCommitToBranchHead, it's not used anymore.
  2. If not too much of an hassle, can we also add tests for dirty branch to Revert and maybe UpdateBranch too?

@nopcoder
Remove unused AddCommitToBranchHead
f18cc4d
@nopcoder
remove unused functions graveler
97a469f
@nopcoder
Fix revert to handle 400
6720943 
Adding more tests in the controller level:
- Merge to dirty branch
- Revert a dirty branch

Remove more unused code
@nopcoder
Copy link
Contributor Author

Some comments:

  1. Let's remove AddCommitToBranchHead, it's not used anymore.
  2. If not too much of an hassle, can we also add tests for dirty branch to Revert and maybe UpdateBranch too?

Thanks - dead code removed.
Added tests to Revert and Merge on the controller level the graveler level test was using a mock for the ref mananger.

itaiad200
itaiad200 approved these changes Oct 26, 2022
View reviewed changes
Copy link
Contributor

@itaiad200 itaiad200 left a comment

Choose a reason for hiding this comment

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

Thanks for applying all the fixes!

@nopcoder nopcoder merged commit a8192ad into master Oct 26, 2022
@nopcoder nopcoder deleted the fix/dirty-branch branch October 26, 2022 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@itaiad200 itaiad200 itaiad200 approved these changes

Assignees

@nopcoder nopcoder

Labels
include-changelog PR description should be included in next release changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bad error in merge to a dirty branch
2 participants
@nopcoder @itaiad200