flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changing the output for git status when there is a rename and modify at the same time

Browse Source
This commit is contained in:
aero-z
2014-06-12 02:47:56 -04:00
parent 3e09624f8a
commit ee5c1e5aa0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/git/status_shortcuts.rb
View File

@@ -127,7 +127,12 @@ end
@stat_hash[group] << {:msg => msg, :col => col, :file => file} if msg
# Work tree modification states
if y == "M"
if x == "R" && y == "M"
# Extract the second file name from the format x -> y
quoted, unquoted = /^(?:"(?:[^"\\]|\\.)*"|[^"].*) -> (?:"((?:[^"\\]|\\.)*)"|(.*[^"]))$/.match(file)[1..2]
renamed_file = quoted || unquoted
@stat_hash[:unstaged] << {:msg => " modified", :col => :mod, :file => renamed_file}
elsif x != "R" && y == "M"
@stat_hash[:unstaged] << {:msg => " modified", :col => :mod, :file => file}
elsif y == "D" && x != "D" && x != "U"
# Don't show deleted 'y' during a merge conflict.