Fixed gh pr checkout on detached HEAD #1889
Conversation
|
I have a suggestion for Branch: func() (string, error) {
currentBranch, err := git.CurrentBranch()
if err != nil {
return "", fmt.Errorf("could not determine current branch: %w", err)
}
return currentBranch, nil
},It could be useful to return the error directly in this case instead of formatting it: Branch: func() (string, error) {
return git.CurrentBranch();
},This will allow us to handle the error like this: currentBranch, err := opts.Branch()
if err != nil && !errors.Is(err, git.ErrNotOnAnyBranch) {
return err
} |
|
Hello, I would like to suggest another approaching. Into the func CurrentBranch() (string, error) {
refCmd := GitCommand("symbolic-ref", "--quiet", "--short", "HEAD")
output, err := run.PrepareCmd(refCmd).Output()
if err == nil {
// Found the branch name
return firstLine(output), nil
}
var cmdErr *run.CmdError
if errors.As(err, &cmdErr) {
if cmdErr.Stderr.Len() == 0 {
// Detached head
return "", ErrNotOnAnyBranch
}
}
// Unknown error
return "", err
}If you are in the HEAD branch and put the I suggest this: func CurrentBranch() (string, error) {
refCmd := GitCommand("rev-parse", "--abbrev-ref", "HEAD") // Change here
output, err := run.PrepareCmd(refCmd).Output()
if err == nil {
// Found the branch name
return firstLine(output), nil
}
var cmdErr *run.CmdError
if errors.As(err, &cmdErr) {
if cmdErr.Stderr.Len() == 0 {
// Detached head
return "", ErrNotOnAnyBranch
}
}
// Unknown error
return "", err
} |
|
@mmontes11 @edualb The current PR takes care of the issue, but if you think that there are potential improvements to CurrentBranch, please open a separate PR! Be sure to reference the issue that the change is fixing. Thank you. |
Fixes #1886