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: Revert with allow empty #8803

Merged
merged 1 commit into from
Mar 14, 2025
Merged

Fix: Revert with allow empty #8803

merged 1 commit into from
Mar 14, 2025

Conversation

N-o-Z
Copy link
Member

@N-o-Z N-o-Z commented Mar 14, 2025

Closes #8801

Waiting for a single approval

@N-o-Z N-o-Z added the bug Something isn't working label Mar 14, 2025
@N-o-Z N-o-Z requested a review from a team March 14, 2025 19:21
@N-o-Z N-o-Z self-assigned this Mar 14, 2025
@N-o-Z N-o-Z added the include-changelog PR description should be included in next release changelog label Mar 14, 2025
Copy link

E2E Test Results - DynamoDB Local - Local Block Adapter

14 passed

Copy link

E2E Test Results - Quickstart

11 passed

@N-o-Z N-o-Z force-pushed the fix/revert-allow-empty-8801 branch from 2708678 to 98382d3 Compare March 14, 2025 19:31
Copy link
Contributor

@itaigilo itaigilo left a comment

Choose a reason for hiding this comment

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

Nice catch, thanks for fixing.

Looking good, approving:

Though when looking at the code, CherryPick seems to use the same pattern.
Should we handle it as well, or open an Issue for it?

@N-o-Z
Copy link
Member Author

N-o-Z commented Mar 14, 2025

Nice catch, thanks for fixing.

Looking good, approving:

Though when looking at the code, CherryPick seems to use the same pattern. Should we handle it as well, or open an Issue for it?

We should probably open a separate issue for it

@N-o-Z N-o-Z merged commit 04fd93c into master Mar 14, 2025
41 checks passed
@N-o-Z N-o-Z deleted the fix/revert-allow-empty-8801 branch March 14, 2025 20:09
@yonipeleg33
Copy link
Contributor

Surely out of scope for this PR, but git-revert doesn't have this flag. Why did we add it instead of aligning with whatever git is doing when reverting an empty commit?

@itaigilo
Copy link
Contributor

Surely out of scope for this PR, but git-revert doesn't have this flag. Why did we add it instead of aligning with whatever git is doing when reverting an empty commit?

AFAICT, it's not about adding this as a flag, but it allows an empty commit for revert -
Assuming that if the original commit was empty, it's ok to allow the reverted commit, which is also empty.

@N-o-Z
Copy link
Member Author

N-o-Z commented Mar 14, 2025

Surely out of scope for this PR, but git-revert doesn't have this flag. Why did we add it instead of aligning with whatever git is doing when reverting an empty commit?

Definitely out of scope of this PR.
I don't remember the requirement consideration then but I'd like to give a more general answer as this question keeps popping up frequently.
Short answer: lakeFS is not Git.
It has its principles based on Git and it draws concepts from it but we're not trying to "comply to a Git spec". Building a versioning engine for data engineers we will and should diverge from Git behavior or principles of it serves the mainstream user better.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working include-changelog PR description should be included in next release changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BUG: Revert empty changes with "allow empty" fails
3 participants