go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-06 22:33:07 +02:00
Code Issues Releases Activity

Cleanup: simplify git arguments for reflog loading

Browse Source 
The combination of --abbrev=40 and %h can be shortened to %H.
This commit is contained in:
Stefan Haller
2025-07-11 17:19:14 +02:00
parent 8515c74722
commit 92b5bad29d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/commands/git_commands/reflog_commit_loader.go
View File

@ -30,8 +30,7 @@ func (self *ReflogCommitLoader) GetReflogCommits(hashPool *utils.StringPool, las
cmdArgs := NewGitCmd("log"). cmdArgs := NewGitCmd("log").
Config("log.showSignature=false"). Config("log.showSignature=false").
Arg("-g"). Arg("-g").
Arg("--abbrev=40"). Arg("--format=%H%x00%ct%x00%gs%x00%P").
Arg("--format=%h%x00%ct%x00%gs%x00%P").
ArgIf(filterAuthor != "", "--author="+filterAuthor). ArgIf(filterAuthor != "", "--author="+filterAuthor).
ArgIf(filterPath != "", "--follow", "--", filterPath). ArgIf(filterPath != "", "--follow", "--", filterPath).
ToArgv() ToArgv()

12
pkg/commands/git_commands/reflog_commit_loader_test.go
View File

@ -39,7 +39,7 @@ func TestGetReflogCommits(t *testing.T) {
{ {
testName: "no reflog entries", testName: "no reflog entries",
runner: oscommands.NewFakeRunner(t). runner: oscommands.NewFakeRunner(t).
ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%P"}, "", nil), ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--format=%H%x00%ct%x00%gs%x00%P"}, "", nil),
lastReflogCommit: nil, lastReflogCommit: nil,
expectedCommitOpts: []models.NewCommitOpts{}, expectedCommitOpts: []models.NewCommitOpts{},
@ -49,7 +49,7 @@ func TestGetReflogCommits(t *testing.T) {
{ {
testName: "some reflog entries", testName: "some reflog entries",
runner: oscommands.NewFakeRunner(t). runner: oscommands.NewFakeRunner(t).
ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%P"}, reflogOutput, nil), ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--format=%H%x00%ct%x00%gs%x00%P"}, reflogOutput, nil),
lastReflogCommit: nil, lastReflogCommit: nil,
expectedCommitOpts: []models.NewCommitOpts{ expectedCommitOpts: []models.NewCommitOpts{
@ -95,7 +95,7 @@ func TestGetReflogCommits(t *testing.T) {
{ {
testName: "some reflog entries where last commit is given", testName: "some reflog entries where last commit is given",
runner: oscommands.NewFakeRunner(t). runner: oscommands.NewFakeRunner(t).
ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%P"}, reflogOutput, nil), ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--format=%H%x00%ct%x00%gs%x00%P"}, reflogOutput, nil),
lastReflogCommit: models.NewCommit(hashPool, models.NewCommitOpts{ lastReflogCommit: models.NewCommit(hashPool, models.NewCommitOpts{
Hash: "c3c4b66b64c97ffeecde", Hash: "c3c4b66b64c97ffeecde",
@ -119,7 +119,7 @@ func TestGetReflogCommits(t *testing.T) {
{ {
testName: "when passing filterPath", testName: "when passing filterPath",
runner: oscommands.NewFakeRunner(t). runner: oscommands.NewFakeRunner(t).
ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%P", "--follow", "--", "path"}, reflogOutput, nil), ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--format=%H%x00%ct%x00%gs%x00%P", "--follow", "--", "path"}, reflogOutput, nil),
lastReflogCommit: models.NewCommit(hashPool, models.NewCommitOpts{ lastReflogCommit: models.NewCommit(hashPool, models.NewCommitOpts{
Hash: "c3c4b66b64c97ffeecde", Hash: "c3c4b66b64c97ffeecde",
@ -144,7 +144,7 @@ func TestGetReflogCommits(t *testing.T) {
{ {
testName: "when passing filterAuthor", testName: "when passing filterAuthor",
runner: oscommands.NewFakeRunner(t). runner: oscommands.NewFakeRunner(t).
ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%P", "--author=John Doe <john@doe.com>"}, reflogOutput, nil), ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--format=%H%x00%ct%x00%gs%x00%P", "--author=John Doe <john@doe.com>"}, reflogOutput, nil),
lastReflogCommit: models.NewCommit(hashPool, models.NewCommitOpts{ lastReflogCommit: models.NewCommit(hashPool, models.NewCommitOpts{
Hash: "c3c4b66b64c97ffeecde", Hash: "c3c4b66b64c97ffeecde",
@ -169,7 +169,7 @@ func TestGetReflogCommits(t *testing.T) {
{ {
testName: "when command returns error", testName: "when command returns error",
runner: oscommands.NewFakeRunner(t). runner: oscommands.NewFakeRunner(t).
ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%P"}, "", errors.New("haha")), ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--format=%H%x00%ct%x00%gs%x00%P"}, "", errors.New("haha")),
lastReflogCommit: nil, lastReflogCommit: nil,
filterPath: "", filterPath: "",