Skip to content

feat(repohub): Fix inconsistent origin on repo update #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loadez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(repohub): Fix inconsistent origin on repo update #836

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion repohub/pkg/gitrekt/update_or_clone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log"
"net/url"
"os/exec"
"strings"
"syscall"
Expand Down Expand Up @@ -66,6 +67,19 @@ func (o *UpdateOrCloneOperation) Update() error {
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Minute)
defer cancel()

remoteURL, err := url.Parse(o.Repository.HttpURL)
Copy link
Contributor

@dexyk dexyk Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@loadez if it's feasable, it would be nice to have a test for the repo url change scenario

if err != nil {
return fmt.Errorf("failed to parse remote URL %s: %w", o.Repository.HttpURL, err)
}

// #nosec G204
updateCmd := exec.CommandContext(ctx, "git", "remote", "set-url", "origin", remoteURL.String())
updateCmd.Dir = o.Repository.Path()
out, err := updateCmd.CombinedOutput()
if err != nil {
log.Printf("failed to update remote URL for %s, out: %s", o.Repository.HttpURL, string(out))
}

var cmd *exec.Cmd
if o.Reference != "" {
log.Printf("fetching from remotes %s with revision %v", o.Repository.Path(), o.Reference)
Expand All @@ -82,7 +96,7 @@ func (o *UpdateOrCloneOperation) Update() error {
cmd.Env = append(cmd.Env, fmt.Sprintf("GIT_USERNAME=%s", o.Repository.Credentials.Username))
cmd.Env = append(cmd.Env, fmt.Sprintf("GIT_PASSWORD=%s", o.Repository.Credentials.Password))

out, err := cmd.CombinedOutput()
out, err = cmd.CombinedOutput()
if err != nil {
log.Printf("(err) Fetch repo %s, out: %s", o.Repository.HttpURL, string(out))
return o.parseError(out, err)
Expand Down