Skip to content

Commit db5e40d

Browse files
Rename ResolveSubmoduleURLForTest to ResolveSubmoduleURL
1 parent 04f798b commit db5e40d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

git/git.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,8 @@ func ProgressWriter(write func(line string, args ...any)) io.WriteCloser {
434434
}
435435

436436
// resolveSubmoduleURL resolves a potentially relative submodule URL against the parent repository URL
437-
// ResolveSubmoduleURLForTest is exported for testing resolveSubmoduleURL logic
438-
func ResolveSubmoduleURLForTest(parentURL, submoduleURL string) (string, error) {
437+
// ResolveSubmoduleURL resolves a potentially relative submodule URL against a parent repository URL.
438+
func ResolveSubmoduleURL(parentURL, submoduleURL string) (string, error) {
439439
// If the submodule URL is absolute (contains ://) or doesn't start with ./ or ../, return it as-is
440440
if strings.Contains(submoduleURL, "://") || (!strings.HasPrefix(submoduleURL, "../") && !strings.HasPrefix(submoduleURL, "./")) {
441441
return submoduleURL, nil
@@ -531,7 +531,7 @@ func initSubmodules(ctx context.Context, logf func(string, ...any), repo *git.Re
531531
logf(" Expected commit: %s", subStatus.Expected)
532532

533533
// Resolve the submodule URL
534-
resolvedURL, err := ResolveSubmoduleURLForTest(parentURL, subConfig.URL)
534+
resolvedURL, err := ResolveSubmoduleURL(parentURL, subConfig.URL)
535535
if err != nil {
536536
return fmt.Errorf("resolve submodule URL for %q: %w", subConfig.Name, err)
537537
}

git/git_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ func TestResolveSubmoduleURL(t *testing.T) {
532532
c := tc
533533
t.Run(c.name, func(t *testing.T) {
534534
t.Parallel()
535-
got, err := git.ResolveSubmoduleURLForTest(c.parentURL, c.subURL)
535+
got, err := git.ResolveSubmoduleURL(c.parentURL, c.subURL)
536536
if c.expectErr != "" {
537537
require.ErrorContains(t, err, c.expectErr)
538538
return

0 commit comments

Comments
 (0)