mirror/lnk
1
0
Fork 0
mirror of https://github.com/yarlson/lnk.git synced 2025-08-31 18:01:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: set 'main' as default branch instead of 'master'

Browse Source
This commit is contained in:
Yar Kravtsov
2025-05-24 06:36:26 +03:00
parent d5812e1085
commit 11cca86f4d
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -42,7 +42,7 @@ sudo mv lnk /usr/local/bin/
lnk init lnk init
``` ```
This creates `$XDG_CONFIG_HOME/lnk` (or `~/.config/lnk`) and initializes a Git repository. This creates `$XDG_CONFIG_HOME/lnk` (or `~/.config/lnk`) and initializes a Git repository with `main` as the default branch.
### Initialize with remote ### Initialize with remote
@@ -52,7 +52,7 @@ lnk init --remote https://github.com/user/dotfiles.git
lnk init -r git@github.com:user/dotfiles.git lnk init -r git@github.com:user/dotfiles.git
``` ```
This initializes the repository and adds the specified URL as the `origin` remote, allowing you to sync your dotfiles with a Git hosting service. This initializes the repository with `main` as the default branch and adds the specified URL as the `origin` remote, allowing you to sync your dotfiles with a Git hosting service.
### Add a file ### Add a file

20
internal/git/git.go
View File

@@ -22,12 +22,28 @@ func New(repoPath string) *Git {
// Init initializes a new Git repository // Init initializes a new Git repository
func (g *Git) Init() error { func (g *Git) Init() error {
cmd := exec.Command("git", "init") // Try using git init -b main first (Git 2.28+)
cmd := exec.Command("git", "init", "-b", "main")
cmd.Dir = g.repoPath cmd.Dir = g.repoPath
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("git init failed: %w\nOutput: %s", err, string(output)) // Fallback to regular init + branch rename for older Git versions
cmd = exec.Command("git", "init")
cmd.Dir = g.repoPath
output, err = cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("git init failed: %w\nOutput: %s", err, string(output))
}
// Set the default branch to main
cmd = exec.Command("git", "symbolic-ref", "HEAD", "refs/heads/main")
cmd.Dir = g.repoPath
if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to set default branch to main: %w", err)
}
} }
return nil return nil

7
test/integration_test.go
View File

@@ -65,6 +65,13 @@ func (suite *LnkIntegrationTestSuite) TestInit() {
// Verify it's a non-bare repo // Verify it's a non-bare repo
configPath := filepath.Join(gitDir, "config") configPath := filepath.Join(gitDir, "config")
suite.FileExists(configPath) suite.FileExists(configPath)
// Verify the default branch is set to 'main'
cmd := exec.Command("git", "symbolic-ref", "HEAD")
cmd.Dir = lnkDir
output, err := cmd.Output()
suite.Require().NoError(err)
suite.Equal("refs/heads/main", strings.TrimSpace(string(output)))
} }
func (suite *LnkIntegrationTestSuite) TestAddFile() { func (suite *LnkIntegrationTestSuite) TestAddFile() {