search

sublimehq / sublime_merge

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

issue when modifying submodule #1357

Closed jrjdavidson closed 2 years ago

jrjdavidson commented 2 years ago

Version info

Description

I am toying around with sublime merge and submodules, trying to decide whether it is worth using them or not. I came across some odd behaviour in sublime merge where if I edit a file in the submodule, sublime merge (or git) seems to add return characters at the end of each line ("<0x0d>")? See screenshot.

I am relatively inexperience with this- so apologies if this is user error!

Steps to reproduce

Steps to reproduce the behavior:

  1. open repository
  2. add submodule
  3. pulled all changes recursively, using the code suggested by milkman (i had done one small change on the submodule repo to test if this works)
  4. make a change locally and save file image
  5. Now if I try to stage and commit, i get an error image

Expected behavior

I would expect only the line that I modified to appear as a change.

jrjdavidson commented 2 years ago

That was definitely user error - sorry! The issue came because I had switched the git binary to "system" under the advanced preferences ( iwas testing something else)- completely unrelated to submodules!