Skip to content

refactor: remove dead MergeRemoteTracking function #23

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
fkautz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: remove dead MergeRemoteTracking function #23

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
14 changes: 0 additions & 14 deletions internal/commons/dolt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,20 +210,6 @@ func RemoteBranchExists(dbDir, remoteBranch string) (bool, error) {
}
return strings.TrimSpace(lines[1]) != "0", nil
}

// MergeRemoteTracking merges the origin remote tracking branch into the
// currently checked-out local branch. If the remote tracking branch doesn't
// exist or the merge fails, this is a best-effort no-op. Used in PR mode to
// bring stale local branches up to date with origin's data.
func MergeRemoteTracking(dbDir, branch string) error {
remoteBranch := "remotes/origin/" + branch
exists, err := RemoteBranchExists(dbDir, remoteBranch)
if err != nil || !exists {
return nil
}
return doltExec(dbDir, "merge", remoteBranch)
}

// CheckoutBranchFrom checks out a branch if it exists, or creates it from
// startPoint if it doesn't. Used in PR mode so new branches start from a
// clean upstream-aligned main, while existing branches (with pending
Expand Down