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

Extract CommitMetaUpdater class, fix "set authors on merge" #7039

Merged
merged 1 commit into from Jun 14, 2023
Merged

Extract CommitMetaUpdater class, fix "set authors on merge" #7039

merged 1 commit into from Jun 14, 2023

Conversation

snazy
Copy link
Member

@snazy snazy commented Jun 13, 2023

... and add some tests

Fixes #6956

snazy
snazy commented Jun 13, 2023
View reviewed changes
...s/services/src/testFixtures/java/org/projectnessie/services/impl/AbstractTestPrincipals.java
@@ -111,7 +111,7 @@ public void committerAndAuthorMerge() throws Exception {
CommitMeta::getHash)
.containsExactly(
"NessieHerself",
"NessieHerself",
"ThatNessieGuy",
Copy link
Member Author

Choose a reason for hiding this comment

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

Adopted to "updated behavior for set-authors"

@snazy snazy added this to the 0.62.0 milestone Jun 14, 2023
@snazy snazy merged commit 9b66ad0 into projectnessie:main Jun 14, 2023
22 checks passed
@snazy snazy deleted the commit-meta-updater-class branch June 14, 2023 14:16
@snazy
Copy link
Member Author

snazy commented Jun 15, 2023

Note: the "pull information from merged commits" clashes with #7035 / #4562, because that will support merging "heavily nested trees" and identifying the "merged commits" would become extremely difficult. Therefore the new storage model will only set the author to the committer.

@snazy snazy mentioned this pull request Jun 15, 2023
Closed
@snazy snazy removed this from the 0.62.0 milestone Jun 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dimas-b dimas-b dimas-b approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merging branches doesn't show any author name
2 participants
@snazy @dimas-b