sublimehq / sublime_merge

Issue tracker for Sublime Merge
https://www.sublimemerge.com
276 stars 14 forks source link

Gitflow release doesn't set tag by default, error when setting tag message #335

Open danielvijge opened 5 years ago

danielvijge commented 5 years ago

Version info

Description

When finishing a release with git flow, two things don't work as expected when using the command palette:

Steps to reproduce

Steps to reproduce the behaviour:

  1. Have a repository with 2 branches (develop & master), initiate git flow. Checkout develop
  2. Run command via command palette to create a release called "1.0"
  3. Run command via command palette to finish the release, and select "release/1.0"
  4. Do not set an optional tag message

Expected behaviour

A tag "1.0" should be created on the master branch, and this tag should be merged into the develop

screenshot 2019-01-05 at 10 57 23

Steps to reproduce

Steps to reproduce the behaviour:

  1. Have a repository with 2 branches (develop & master), initiate git flow. Checkout develop
  2. Run command via command palette to create a release called "1.1"
  3. Run command via command palette to finish the release, and select "release/1.1"
  4. Type as the optional tag message "Created release 1.1"

Expected behaviour

A tag "1.0" with the message "Created release 1.1" should be created on the master branch, and this tag should be merged into the develop

screenshot 2019-01-05 at 10 59 06

Screenshots

Note that when I use a single word as the commit message, it works almost as expected, although the Tag message is "Done 1.1" instead of the "Done" that I used as input

screenshot 2019-01-05 at 11 01 39

As a comparison, with SourceTree, I can set an optional tag message as "Finished release 1.2" and it shows up correctly: screenshot 2019-01-05 at 11 07

Mythique commented 4 years ago

This bug is still in build 1119.

alexifm commented 4 years ago

is it still in 1119?

Version info

OS: macOS 10.15.4
Build: 1119
System git: 2.26.0
System git flow: 1.12.3 (AVH Edition)

I was doing some of the same steps and it seems to work fine for me:

gitflow
Borodkov commented 4 years ago

yes. just now checked it in two cases:

fix this pls

Borodkov commented 4 years ago

win10 + git 2.26 + advanced settings in SM 'Git Binary' = system

alexifm commented 4 years ago

@Borodkov I think this is a separate issue.

Here is what I find:

The point is that when using the context menu, the tag message is completely skipped and no tag is created. But using the command palette opens the tag feature. But I'm on MacOS so it might be different, it's just what I've found.

Borodkov commented 4 years ago

yes, you're right. i have the same

always start with 'Tools' -> 'Start Git Flow...' and always finish with context mouse menu and have this problem

now try to finish with ctrl+p (command palette on win) and find cmd 'Git Flow: finish release branch' = tag + my entered msg + commit in develop 'Merge tag '1.2.2' into develop'

it's works like i need from ctrl+p

dpjohnst commented 4 years ago

Fixed in Sublime Merge Build 2032 (stable)

When you have a chance, could you confirm the issue is fixed on your end?

danielvijge commented 4 years ago

Release can now be finished by setting a tag message.

When not setting a tag message, no tag is created at all. This is somewhat inconsistent with the command line, where if a tag message is skipped there is an error (but part of the merge already happened, which I would consider also not good).

Not sure if it would make sense to set a default tag message (e.g. equal to the tag name) to avoid this.