fix(commit_loader): fix log command

jesseduffield · Mar 16, 2023 · 55fb3ef · 55fb3ef
1 parent 516e963
commit 55fb3ef
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/pkg/commands/git_commands/commit_loader.go b/pkg/commands/git_commands/commit_loader.go
@@ -410,9 +410,11 @@ func (self *CommitLoader) getLogCmd(opts GetCommitsOptions) oscommands.ICmdObj {
  limitFlag = " -300"
  }
 
+ followFlag := ""
  filterFlag := ""
  if opts.FilterPath != "" {
- filterFlag = fmt.Sprintf(" --follow -- %s", self.cmd.Quote(opts.FilterPath))
+ followFlag = " --follow"
+ filterFlag = fmt.Sprintf(" %s", self.cmd.Quote(opts.FilterPath))
  }
 
  config := self.UserConfig.Git.Log
@@ -428,13 +430,14 @@ func (self *CommitLoader) getLogCmd(opts GetCommitsOptions) oscommands.ICmdObj {
 
  return self.cmd.New(
  fmt.Sprintf(
- "git -c log.showSignature=false log %s%s%s --oneline %s%s --abbrev=%d%s",
+ "git log %s%s%s --oneline %s%s --abbrev=%d%s --no-show-signature --%s",
  self.cmd.Quote(opts.RefName),
  orderFlag,
  allFlag,
  prettyFormat,
  limitFlag,
  40,
+ followFlag,
  filterFlag,
  ),
  ).DontLog()

diff --git a/pkg/commands/git_commands/commit_loader_test.go b/pkg/commands/git_commands/commit_loader_test.go
@@ -42,7 +42,7 @@ func TestGetCommits(t *testing.T) {
  opts: GetCommitsOptions{RefName: "HEAD", IncludeRebaseCommits: false},
  runner: oscommands.NewFakeRunner(t).
  Expect(`git merge-base "HEAD" "HEAD"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
- Expect(`git -c log.showSignature=false log "HEAD" --topo-order --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40`, "", nil),
+ Expect(`git log "HEAD" --topo-order --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40 --no-show-signature --`, "", nil),
 
  expectedCommits: []*models.Commit{},
  expectedError: nil,
@@ -55,7 +55,7 @@ func TestGetCommits(t *testing.T) {
  opts: GetCommitsOptions{RefName: "refs/heads/mybranch", IncludeRebaseCommits: false},
  runner: oscommands.NewFakeRunner(t).
  Expect(`git merge-base "refs/heads/mybranch" "mybranch"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
- Expect(`git -c log.showSignature=false log "refs/heads/mybranch" --topo-order --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40`, "", nil),
+ Expect(`git log "refs/heads/mybranch" --topo-order --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40 --no-show-signature --`, "", nil),
 
  expectedCommits: []*models.Commit{},
  expectedError: nil,
@@ -70,7 +70,7 @@ func TestGetCommits(t *testing.T) {
  // here it's seeing which commits are yet to be pushed
  Expect(`git merge-base "HEAD" "HEAD"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
  // here it's actually getting all the commits in a formatted form, one per line
- Expect(`git -c log.showSignature=false log "HEAD" --topo-order --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40`, commitsOutput, nil).
+ Expect(`git log "HEAD" --topo-order --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40 --no-show-signature --`, commitsOutput, nil).
  // here it's seeing where our branch diverged from the master branch so that we can mark that commit and parent commits as 'merged'
  Expect(`git merge-base "HEAD" "master"`, "26c07b1ab33860a1a7591a0638f9925ccf497ffa", nil),
 
@@ -198,7 +198,20 @@ func TestGetCommits(t *testing.T) {
  opts: GetCommitsOptions{RefName: "HEAD", IncludeRebaseCommits: false},
  runner: oscommands.NewFakeRunner(t).
  Expect(`git merge-base "HEAD" "HEAD"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
- Expect(`git -c log.showSignature=false log "HEAD" --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40`, "", nil),
+ Expect(`git log "HEAD" --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40 --no-show-signature --`, "", nil),
+
+ expectedCommits: []*models.Commit{},
+ expectedError: nil,
+ },
+ {
+ testName: "should set filter path",
+ logOrder: "default",
+ rebaseMode: enums.REBASE_MODE_NONE,
+ currentBranchName: "master",
+ opts: GetCommitsOptions{RefName: "HEAD", FilterPath: "src"},
+ runner: oscommands.NewFakeRunner(t).
+ Expect(`git merge-base "HEAD" "HEAD"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+ Expect(`git log "HEAD" --oneline --pretty=format:"%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s" --abbrev=40 --follow --no-show-signature -- "src"`, "", nil),
 
  expectedCommits: []*models.Commit{},
  expectedError: nil,