File tree Expand file tree Collapse file tree 1 file changed +7
-5
lines changed
Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -176,16 +176,18 @@ function M.interactiveStaging()
176176 -- GET ALL HUNKS
177177 u .intentToAddUntrackedFiles () -- include untracked files, enables using `--diff-filter=A`
178178 local contextSize = require (" tinygit.config" ).config .stage .contextSize
179+ -- stylua: ignore start
179180 local diffArgs = {
180181 " git" ,
181- " -c" ,
182- " diff.mnemonicPrefix=false" , -- `mnemonicPrefix` creates irregular diff header (#34)
182+ " -c" , " diff.mnemonicPrefix=false" , -- `mnemonicPrefix` creates irregular diff header (#34)
183+ " -c" , " diff.srcPrefix=a/" , -- in case use overwrites any of these
184+ " -c" , " diff.dstPrefix=b/" ,
185+ " -c" , " diff.noPrefix=false" ,
183186 " --no-pager" ,
184187 " diff" ,
185- " --no-ext-diff" ,
186- " --unified=" .. contextSize ,
187- " --diff-filter=ADMR" ,
188+ " --no-ext-diff" , " --unified=" .. contextSize , " --diff-filter=ADMR" ,
188189 }
190+ -- stylua: ignore end
189191 -- no trimming, since trailing empty lines can be blank context lines in diff output
190192 local changesDiff = u .syncShellCmd (diffArgs , " notrim" )
191193 local changedHunks = getHunksFromDiffOutput (changesDiff , false )
You can’t perform that action at this time.
0 commit comments