TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-10-26 09:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5299 from Martin2112/go_cleanup

Browse Source 
A few more small cleanups that should not change behaviour.
This commit is contained in:
Michael Eischer
2025-03-24 13:59:39 +01:00
committed by GitHub
parent e3ddc8a463 6caad10840
commit 9aad8e9ea5
11 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/restic/cmd_repair_index_integration_test.go
View File

@@ -64,11 +64,11 @@ func TestRebuildIndex(t *testing.T) {
}
func TestRebuildIndexAlwaysFull(t *testing.T) {
indexFull := index.IndexFull
indexFull := index.Full
defer func() {
index.IndexFull = indexFull
index.Full = indexFull
}()
index.IndexFull = func(*index.Index) bool { return true }
index.Full = func(*index.Index) bool { return true }
testRebuildIndex(t, nil)
}

2
cmd/restic/global.go
View File

@@ -302,7 +302,7 @@ func resolvePassword(opts *GlobalOptions, envStr string) (string, error) {
if err != nil {
return "", err
}
return (strings.TrimSpace(string(output))), nil
return strings.TrimSpace(string(output)), nil
}
if opts.PasswordFile != "" {
return loadPasswordFromFile(opts.PasswordFile)