summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Callaway <scott.callaway@uipath.com>2023-04-13 10:57:35 +0100
committerScott Callaway <scott.callaway@uipath.com>2023-04-13 10:57:38 +0100
commit6ffe98abacc1040a61e5a7eb532ff89153ebe888 (patch)
treefcbee300a90b7c263f61fe01398e71188478afa6
parent046cb942c23022668e7a8b1e418f0418842e06ab (diff)
feat: remove --no-renames flag from main panel diffs (to show renamed files)
-rw-r--r--pkg/commands/git_commands/commit.go2
-rw-r--r--pkg/commands/git_commands/commit_test.go8
2 files changed, 5 insertions, 5 deletions
diff --git a/pkg/commands/git_commands/commit.go b/pkg/commands/git_commands/commit.go
index 0a162a6b6..38459e351 100644
--- a/pkg/commands/git_commands/commit.go
+++ b/pkg/commands/git_commands/commit.go
@@ -160,7 +160,7 @@ func (self *CommitCommands) ShowCmdObj(sha string, filterPath string, ignoreWhit
ignoreWhitespaceArg = " --ignore-all-space"
}
- cmdStr := fmt.Sprintf("git show --submodule --color=%s --unified=%d --no-renames --stat -p %s%s%s",
+ cmdStr := fmt.Sprintf("git show --submodule --color=%s --unified=%d --stat -p %s%s%s",
self.UserConfig.Git.Paging.ColorArg, contextSize, sha, ignoreWhitespaceArg, filterPathArg)
return self.cmd.New(cmdStr).DontLog()
}
diff --git a/pkg/commands/git_commands/commit_test.go b/pkg/commands/git_commands/commit_test.go
index 74341bba8..268e44e46 100644
--- a/pkg/commands/git_commands/commit_test.go
+++ b/pkg/commands/git_commands/commit_test.go
@@ -190,28 +190,28 @@ func TestCommitShowCmdObj(t *testing.T) {
filterPath: "",
contextSize: 3,
ignoreWhitespace: false,
- expected: "git show --submodule --color=always --unified=3 --no-renames --stat -p 1234567890",
+ expected: "git show --submodule --color=always --unified=3 --stat -p 1234567890",
},
{
testName: "Default case with filter path",
filterPath: "file.txt",
contextSize: 3,
ignoreWhitespace: false,
- expected: `git show --submodule --color=always --unified=3 --no-renames --stat -p 1234567890 -- "file.txt"`,
+ expected: `git show --submodule --color=always --unified=3 --stat -p 1234567890 -- "file.txt"`,
},
{
testName: "Show diff with custom context size",
filterPath: "",
contextSize: 77,
ignoreWhitespace: false,
- expected: "git show --submodule --color=always --unified=77 --no-renames --stat -p 1234567890",
+ expected: "git show --submodule --color=always --unified=77 --stat -p 1234567890",
},
{
testName: "Show diff, ignoring whitespace",
filterPath: "",
contextSize: 77,
ignoreWhitespace: true,
- expected: "git show --submodule --color=always --unified=77 --no-renames --stat -p 1234567890 --ignore-all-space",
+ expected: "git show --submodule --color=always --unified=77 --stat -p 1234567890 --ignore-all-space",
},
}