search

sublimehq / sublime_merge

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

Unstaging hunk from a renamed file errors out #1856

Open allejo opened 6 months ago

allejo commented 6 months ago

Version info

Description

I am trying to unstage a hunk on a file that has been renamed; Merge then attempts to unstage the hunk from the original file name instead of the new, renamed name.

Steps to reproduce

Steps to reproduce the behavior:

  1. Rename a tracked file and stage the whole file image
  2. Unstage a hunk from said file image
  3. Make a commit and it'll fail image

Expected behavior

For the hunk to be correctly unstaged but the rest of the file remains staged

dpjohnst commented 5 months ago

Hi @allejo,

Thanks for reporting this issue - I've been able to identify the cause of the issue and a fix will be available in the next build.

Kind regards, - Dylan from Sublime HQ