search

sublimehq / sublime_merge

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

Amend fails when commit message is nothing but newlines #1853

Open allejo opened 6 months ago

allejo commented 6 months ago

Version info

Description

In my Git configuration, I have commit.template set to a file with the following contents.

# Commit

# Extended desc

# 50 char ---------------------------------------|
# 72 char =============================================================|

When I go and try to amend a commit, it fails because I have an empty commit message. The new lines are being treated as "non-empty" according to Merge but Git treats them as empty

image

Steps to reproduce

Steps to reproduce the behavior:

  1. Amend a commit with newlines only in the commit message

Expected behavior

It should trim the newlines and treat it as an empty commit message and use the --no-edit flag

dpjohnst commented 5 months ago

Hi @allejo,

Thank you for reporting this issue - we've identified the cause of the issue and it will be resolved in the next build.

Kind regards, - Dylan from Sublime HQ