From 6c4e44e036c2e358e0d6ca37c41654bfc7efdcac Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 02 Apr 2025 10:55:45 +0800 Subject: [PATCH] Git: Simplify/lint --- git_plumbing.go | 13 +++---------- diff --git a/git_plumbing.go b/git_plumbing.go index 6adaf5a7a4227a2ae511d7ad087ad119f2a00f0d..c210027106fa89ce7b65309bda276ad1bb4477b2 100644 --- a/git_plumbing.go +++ b/git_plumbing.go @@ -26,18 +26,11 @@ return !(entries[i].mode == "40000") && (entries[j].mode == "40000") } if strings.HasPrefix(nameJ, nameI) && len(nameI) < len(nameJ) { - if entries[i].mode == "40000" { - return false - } - return true + return !(entries[i].mode == "40000") } if strings.HasPrefix(nameI, nameJ) && len(nameJ) < len(nameI) { - // nameJ is a prefix of nameI - if entries[j].mode == "40000" { - return true - } - return false + return entries[j].mode == "40000" } return nameI < nameJ @@ -66,7 +59,7 @@ } return strings.TrimSpace(out.String()), nil } -func buildTreeRecursive(ctx context.Context, repoPath string, baseTree string, updates map[string][]byte) (string, error) { +func buildTreeRecursive(ctx context.Context, repoPath, baseTree string, updates map[string][]byte) (string, error) { treeCache := make(map[string][]treeEntry) var walk func(string, string) error -- 2.48.1