Skip to content

Conversation

@erezrokah
Copy link
Contributor

Empty commits could have been created before #3306 was merged and published.

This fixes rebasing of entries created with empty commits.

@erezrokah erezrokah requested a review from a team March 12, 2020 11:02
@erquhart
Copy link
Contributor

Should we add some test coverage for this case?

Sent with GitHawk

@erezrokah
Copy link
Contributor Author

Should we add some test coverage for this case?

This is quite an unusual case reflected by another bug.
I've been meaning to add edge cases scenarios to our e2e testing (e.g. out of sync forks, larger that 250 commits diffs). I'll add that to the list.

@erezrokah
Copy link
Contributor Author

Context #3373

@erezrokah erezrokah merged commit 70de9f6 into master Mar 12, 2020
@erezrokah erezrokah deleted the fix/handle_empty_diff_rebase branch March 12, 2020 13:28
vladdu pushed a commit to vladdu/netlify-cms that referenced this pull request Jan 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants