Rebase against main

nephio-project · Jan 20, 2025 · fb2dcf4 · fb2dcf4
1 parent 8f07bce
commit fb2dcf4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/repoimpl/git/git.go b/pkg/repoimpl/git/git.go
@@ -1235,7 +1235,7 @@ func (r *gitRepository) GetResources(hash plumbing.Hash) (map[string]string, err
 
 // findLatestPackageCommit returns the latest commit from the history that pertains
 // to the package given by the packagePath. If no commit is found, it will return nil.
-func (r *gitRepository) findLatestPackageCommit(_ context.Context, startCommit *object.Commit, packagePath string) (*object.Commit, error) {
+func (r *gitRepository) findLatestPackageCommit(startCommit *object.Commit, packagePath string) (*object.Commit, error) {
 	var commit *object.Commit
 	err := r.packageHistoryIterator(startCommit, packagePath, func(c *object.Commit) error {
 		commit = c
@@ -1344,7 +1344,7 @@ func (r *gitRepository) GetLifecycle(ctx context.Context, pkgRev *gitPackageRevi
 	return r.getLifecycle(pkgRev)
 }
 
-func (r *gitRepository) getLifecycle(_ context.Context, pkgRev *gitPackageRevision) v1alpha1.PackageRevisionLifecycle {
+func (r *gitRepository) getLifecycle(pkgRev *gitPackageRevision) v1alpha1.PackageRevisionLifecycle {
 	switch ref := pkgRev.ref; {
 	case ref == nil:
 		return r.checkPublishedLifecycle(pkgRev)

diff --git a/pkg/repoimpl/git/primitives_test.go b/pkg/repoimpl/git/primitives_test.go
@@ -438,7 +438,7 @@ func initRepositoryWithRemote(t *testing.T, dir, address string) *git.Repository
 	return repo
 }
 
-func createTestCommit(t *testing.T, repo *git.Repository, parent plumbing.Hash, _, name, contents string) plumbing.Hash {
+func createTestCommit(t *testing.T, repo *git.Repository, parent plumbing.Hash, message, name, contents string) plumbing.Hash {
 	wt, err := repo.Worktree()
 	if err != nil {
 		t.Fatalf("Failed getting worktree: %v", err)