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

merge: adding commit message still does a fast-forward merge #705

Closed
rcoup opened this issue Aug 24, 2022 · 0 comments · Fixed by #708
Closed

merge: adding commit message still does a fast-forward merge #705

rcoup opened this issue Aug 24, 2022 · 0 comments · Fixed by #708
Assignees
@olsen232
Labels
bug Something isn't working

Comments

@rcoup
Copy link
Member

rcoup commented Aug 24, 2022

Describe the bug

If you merge a branch and provide a commit message via -m, kart still does a fast-forward merge if it can.

To Reproduce

$ kart merge mybranch -m "merge changes in"
Merging branch "mybranch" into main
Fast-forwarded to 0c25c32d8f7712ec2266b598599aadb43cdb4061
Updating myproject.gpkg ...
$ kart log
commit 0c25c32d8f7712ec2266b598599aadb43cdb4061 (HEAD -> main, mybranch)
Author: me <me@example.com>
Date:   Wed Aug 24 10:17:38 2022 +0200

    Add new features

Expected behaviour

I'd get a non-fast-forward merge commit with the message I provided.

**Version Info **

  • OS: macOS
  • Version: v0.11.6.dev0 at d97b53e
@rcoup rcoup added the bug Something isn't working label Aug 24, 2022
@olsen232 olsen232 mentioned this issue Aug 25, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@olsen232 olsen232

Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Merge -m should imply merge --no-ff koordinates/kart
2 participants
@rcoup @olsen232