Skip to content

Fix bug when repo remained bare if multiple branches pushed in single push #4923

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

Merged
merged 2 commits into from
Sep 13, 2018
Merged

Fix bug when repo remained bare if multiple branches pushed in single push #4923

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f228007
Fix bug when repo remained bare if multiple branches pushed
SagePtr Sep 12, 2018
4ca7cfa
Merge branch 'master' into issue4919
lunny Sep 13, 2018
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: 4 additions & 2 deletions models/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,12 +537,14 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
}

refName := git.RefEndName(opts.RefFullName)
if repo.IsBare && refName != repo.DefaultBranch {

// Change default branch and bare status only if pushed ref is non-empty branch.
if repo.IsBare && opts.NewCommitID != git.EmptySHA && strings.HasPrefix(opts.RefFullName, git.BranchPrefix) {
repo.DefaultBranch = refName
repo.IsBare = false
}

// Change repository bare status and update last updated time.
repo.IsBare = repo.IsBare && opts.Commits.Len <= 0
if err = UpdateRepository(repo, false); err != nil {
return fmt.Errorf("UpdateRepository: %v", err)
}
Expand Down