Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Commits are not sort topologically using Git Flow (hotfix, releases) #585

Open
1 task done
ambroisemaupate opened this issue Mar 29, 2024 · 3 comments
Open
1 task done
Assignees
Labels
bug Something isn't working

Comments

@ambroisemaupate
Copy link

Is there an existing issue for this?

  • I have searched the existing issues

Description of the bug

Commit are still not sorted topologically when dealing with multiple branches workflows such as Git-flow.
Unreleased commits are included in Changelog versions becauses they are earlier than the release

PR: #415
Issues #38 and #188

Steps To Reproduce

Initialize a repository with Git Flow:

  • Create commits on main branch
  • Create newer commits on develop branch
  • Initialize an hotfix
    • Create commits only in hotfix
    • Generate CHANGELOG with a tag
    • Finish hotfix

Use

# sort the tags topologically
topo_order = true

Expected behavior

All 3 commits from Manuel Odelain must be included in unreleased section, not in 1.2.11 version

Actual output:

# Changelog

All notable changes to project will be documented in this file.

## 1.2.11- 2024-03-28

### Bug Fixes

- **(VTopBar)** Fixed grid layout for more space for main menu - (cdcda2f) - Ambroise Maupate

### Styling

- **(form)** fix input / select disabled state - (0648046) - Manuel Odelain
- **(reservation)** fix placeholder text indent - (cbb5c15) - Manuel Odelain
- **(select)** fix border regression - (ff9a1aa) - Manuel Odelain
- Improved rental email layout for Mobile - (34fafd7) - Ambroise Maupate

## 1.2.10 - 2024-03-28

### Bug Fixes

- Force email images to have white background when they are transparent  - Ambroise Maupate

Theses commits were not in 1.2.11 hotfix ! And should be in unreleased section or in next 1.2.12 release

- **(form)** fix input / select disabled state - (0648046) - Manuel Odelain
- **(reservation)** fix placeholder text indent - (cbb5c15) - Manuel Odelain
- **(select)** fix border regression - (ff9a1aa) - Manuel Odelain

Expected output:

# Changelog

All notable changes to project will be documented in this file.

## Unreleased

### Styling

- **(form)** fix input / select disabled state - (0648046) - Manuel Odelain
- **(reservation)** fix placeholder text indent - (cbb5c15) - Manuel Odelain
- **(select)** fix border regression - (ff9a1aa) - Manuel Odelain

## 1.2.11- 2024-03-28

### Bug Fixes

- **(VTopBar)** Fixed grid layout for more space for main menu - (cdcda2f) - Ambroise Maupate

### Styling

- Improved rental email layout for Mobile - (34fafd7) - Ambroise Maupate

## 1.2.10 - 2024-03-28

### Bug Fixes

- Force email images to have white background when they are transparent  - Ambroise Maupate

Screenshots / Logs

image

Software information

  • Operating system: MacOS / Ubuntu
  • Project version: 2.1.2

Additional context

No response

@ambroisemaupate ambroisemaupate added the bug Something isn't working label Mar 29, 2024
Copy link

welcome bot commented Mar 29, 2024

Thanks for opening your first issue at git-cliff! Be sure to follow the issue template! ⛰️

@ambroisemaupate
Copy link
Author

If I ask git-cliff to only output the current release it works:

git cliff --current

# Changelog

All notable changes to project will be documented in this file.

## Unreleased

### Styling

- **(form)** fix input / select disabled state - (0648046) - Manuel Odelain
- **(reservation)** fix placeholder text indent - (cbb5c15) - Manuel Odelain
- **(select)** fix border regression - (ff9a1aa) - Manuel Odelain

@ambroisemaupate
Copy link
Author

Related to #498

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants