From 2dfef09e552af5a8d382d2e5e53d3d82d7b95410 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 28 Jul 2018 16:52:20 +1000 Subject: [PATCH] show whitespace in diffs again --- gitcommands.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitcommands.go b/gitcommands.go index 38da938b2..eff864b59 100644 --- a/gitcommands.go +++ b/gitcommands.go @@ -317,8 +317,8 @@ func sublimeOpenFile(filename string) (string, error) { func getBranchDiff(branch string, baseBranch string) (string, error) { - return runCommand("git log -p -30 --color --no-merges " + branch) - // return runCommand("git diff --color " + baseBranch + "..." + branch) + return runCommand("git log -p -30 --color --no-merges " + branch) + // return runCommand("git diff --color " + baseBranch + "..." + branch) } func verifyInGitRepo() { @@ -386,7 +386,7 @@ func getDiff(file GitFile) string { if !file.Tracked && !file.HasStagedChanges { trackedArg = "--no-index /dev/null " } - command := "git diff -b --color " + cachedArg + deletedArg + trackedArg + file.Name + command := "git diff --color " + cachedArg + deletedArg + trackedArg + file.Name // for now we assume an error means the file was deleted s, _ := runCommand(command) return s