Skip to content

Disable git advice on detached checkout #1878

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
artem-zinnatullin wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Disable git advice on detached checkout #1878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1e12cb
Disable git advice on detached checkout
artem-zinnatullin Dec 13, 2022
34ae3a3
fix test
artem-zinnatullin Dec 16, 2022
c0dc277
fix go fmt
artem-zinnatullin Dec 16, 2022
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
2 changes: 1 addition & 1 deletion bootstrap/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func gitCheckout(ctx context.Context, sh shellRunner, gitCheckoutFlags, referenc
return fmt.Errorf("%q is not a valid git ref format", reference)
}

commandArgs := []string{"checkout"}
commandArgs := []string{"-c", "advice.detachedHead=false", "checkout"}
commandArgs = append(commandArgs, individualCheckoutFlags...)
commandArgs = append(commandArgs, reference)

Expand Down
2 changes: 1 addition & 1 deletion bootstrap/git_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func TestGitCheckoutValidatesRef(t *testing.T) {
}

func TestGitCheckout(t *testing.T) {
sh := new(mockShellRunner).Expect("git", "checkout", "-f", "-q", "main")
sh := new(mockShellRunner).Expect("git", "-c", "advice.detachedHead=false", "checkout", "-f", "-q", "main")
defer sh.Check(t)
err := gitCheckout(context.Background(), sh, "-f -q", "main")
require.NoError(t, err)
Expand Down