30044417887

Committed 23 Jul 2026 08:59PM UTC coverage: 78.204% (+0.06%) from 78.143%

Build # 30044417887

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #1500 from gittuf/fix-tests

pkg: Fix gitinterface test

Coverage Stats

1 of 1 new or added line in 1 file covered. (100.0%)

31 existing lines in 4 files now uncovered.

12834 of 16411 relevant lines covered (78.2%)

36.49 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.89

/pkg/gitinterface/utils.go

// Copyright The gittuf Authors
// SPDX-License-Identifier: Apache-2.0

package gitinterface

import (
        "fmt"
        "path"
        "strings"
        "testing"
)

// ResetDueToError reverses a change applied to a ref to the specified target
// ID. It is used to ensure a gittuf operation is atomic: if a gittuf operation
// fails, any changes made to the repository in refs/gittuf can be rolled back.
// Worktrees are not updated.
func (r *Repository) ResetDueToError(cause error, refName string, commitID Hash) error {
        if err := r.SetReference(refName, commitID); err != nil {
                return fmt.Errorf("unable to reset %s to %s, caused by following error: %w", refName, commitID.String(), cause)
        }
        return cause
}

func RemoteRef(refName, remoteName string) string {
        var remotePath string
        switch {
        case strings.HasPrefix(refName, BranchRefPrefix):
                // refs/heads/<path> -> refs/remotes/<remote>/<path>
                rest := strings.TrimPrefix(refName, BranchRefPrefix)
                remotePath = path.Join(RemoteRefPrefix, remoteName, rest)
        case strings.HasPrefix(refName, TagRefPrefix):
                // refs/tags/<path> -> refs/tags/<path>
                remotePath = refName
        default:
                // refs/<path> -> refs/remotes/<remote>/<path>
                rest := strings.TrimPrefix(refName, RefPrefix)
                remotePath = path.Join(RemoteRefPrefix, remoteName, rest)
        }

        return remotePath
}

// RestoreWorktree is a test helper to fix the worktree in tests where we need
// to operate in a checked out copy of the repository. This is primarily needed
// for support with older Git versions.
func (r *Repository) RestoreWorktree(t *testing.T) {
        t.Helper()

        worktree := r.gitDirPath
        if !r.IsBare() {
                worktree = strings.TrimSuffix(worktree, ".git") // TODO: this doesn't support detached git dir
        }

        if _, err := r.executor("restore", "--staged", ".").withDir(worktree).executeString(); err != nil {
                t.Fatal(err)
        }

        if _, err := r.executor("restore", ".").withDir(worktree).executeString(); err != nil {
                t.Fatal(err)
        }
}

func testNameToRefName(testName string) string {
        return BranchReferenceName(strings.ReplaceAll(testName, " ", "__"))
}

1	// Copyright The gittuf Authors
2	// SPDX-License-Identifier: Apache-2.0
3
4	package gitinterface
5
6	import (
7	"fmt"
8	"path"
9	"strings"
10	"testing"
11	)
12
13	// ResetDueToError reverses a change applied to a ref to the specified target
14	// ID. It is used to ensure a gittuf operation is atomic: if a gittuf operation
15	// fails, any changes made to the repository in refs/gittuf can be rolled back.
16	// Worktrees are not updated.
17	func (r *Repository) ResetDueToError(cause error, refName string, commitID Hash) error {	2✔
18	if err := r.SetReference(refName, commitID); err != nil {	3✔
19	return fmt.Errorf("unable to reset %s to %s, caused by following error: %w", refName, commitID.String(), cause)	1✔
20	}	1✔
21	return cause	1✔
22	}
23
24	func RemoteRef(refName, remoteName string) string {	10✔
25	var remotePath string	10✔
26	switch {	10✔
27	case strings.HasPrefix(refName, BranchRefPrefix):	6✔
28	// refs/heads/<path> -> refs/remotes/<remote>/<path>	6✔
29	rest := strings.TrimPrefix(refName, BranchRefPrefix)	6✔
30	remotePath = path.Join(RemoteRefPrefix, remoteName, rest)	6✔
31	case strings.HasPrefix(refName, TagRefPrefix):	2✔
32	// refs/tags/<path> -> refs/tags/<path>	2✔
33	remotePath = refName	2✔
34	default:	2✔
35	// refs/<path> -> refs/remotes/<remote>/<path>	2✔
36	rest := strings.TrimPrefix(refName, RefPrefix)	2✔
37	remotePath = path.Join(RemoteRefPrefix, remoteName, rest)	2✔
38	}
39
40	return remotePath	10✔
41	}
42
43	// RestoreWorktree is a test helper to fix the worktree in tests where we need
44	// to operate in a checked out copy of the repository. This is primarily needed
45	// for support with older Git versions.
46	func (r Repository) RestoreWorktree(t testing.T) {	1✔
47	t.Helper()	1✔
48		1✔
49	worktree := r.gitDirPath	1✔
50	if !r.IsBare() {	2✔
51	worktree = strings.TrimSuffix(worktree, ".git") // TODO: this doesn't support detached git dir	1✔
52	}	1✔
53
54	if _, err := r.executor("restore", "--staged", ".").withDir(worktree).executeString(); err != nil {	1✔
UNCOV 55	t.Fatal(err)	×
56	}	×
57
58	if _, err := r.executor("restore", ".").withDir(worktree).executeString(); err != nil {	1✔
59	t.Fatal(err)	×
60	}	×
61	}
62
63	func testNameToRefName(testName string) string {	59✔
64	return BranchReferenceName(strings.ReplaceAll(testName, " ", "__"))	59✔
65	}	59✔

gittuf / gittuf / 30044417887

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous