Skip to content
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

fix: avoid resetting fetch head when doing branch fetch unshallow #4577

Merged
merged 2 commits into from
Nov 7, 2024
Merged

fix: avoid resetting fetch head when doing branch fetch unshallow #4577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dc733d
fix: avoid resetting fetch head
0x0013 Mar 14, 2024
0fd0387
fix: align code with logging change
0x0013 May 21, 2024
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
6 changes: 6 additions & 0 deletions server/events/working_dir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,12 @@ func (w *FileWorkspace) mergeToBaseBranch(logger logging.SimpleLogging, c wrappe
if err := w.wrappedGit(logger, c, "fetch", "--unshallow"); err != nil {
return err
}

// fetch once more, otherwise `FETCH_HEAD` was reset to base when we ran
// fetch --unshallow
if err := w.wrappedGit(logger, c, "fetch", fetchRemote, fetchRef); err != nil {
return err
}
}

// We use --no-ff because we always want there to be a merge commit.
Expand Down