MichaelMure/git-bug
1
1
Fork 0
mirror of https://github.com/MichaelMure/git-bug.git synced 2024-12-14 17:51:44 +03:00
Code Issues Projects Releases Wiki Activity

Check git version before removing config section

Browse Source 
update git config tests
This commit is contained in:
Amine Hilaly 2019-07-07 13:44:10 +02:00
parent 08f9bafd09
commit bb68b391a0
No known key found for this signature in database
GPG Key ID: 3F4C54B792F211C1
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
repository/git.go
View File

@ -13,6 +13,7 @@ import (
"github.com/MichaelMure/git-bug/util/git"
"github.com/MichaelMure/git-bug/util/lamport"
"github.com/blang/semver"
)
const createClockFile = "/.git/git-bug/create-clock"
@ -264,13 +265,46 @@ func (repo *GitRepo) RmConfigs(keyPrefix string) error {
// try to remove key/value pair by key
_, err := repo.runGitCommand("config", "--unset-all", keyPrefix)
if err != nil {
// try to remove section
_, err = repo.runGitCommand("config", "--remove-section", keyPrefix)
// starting from git 2.18.0 sections are automatically deleted when the last existing
// key/value is removed. Before 2.18.0 we should remove the section
// see https://github.com/git/git/blob/master/Documentation/RelNotes/2.18.0.txt#L379
var ok bool
ok, err = repo.gitVersionLT218()
if err != nil {
return fmt.Errorf("getting git version: %v", err)
}
if ok {
// try to remove section
_, err = repo.runGitCommand("config", "--remove-section", keyPrefix)
}
}
return err
}
func (repo *GitRepo) gitVersionLT218() (bool, error) {
versionOut, err := repo.runGitCommand("version")
if err != nil {
return false, err
}
versionString := strings.Fields(versionOut)[2]
version, err := semver.Make(versionString)
if err != nil {
return false, err
}
version218string := "2.18.0"
gitVersion218, err := semver.Make(version218string)
if err != nil {
return false, err
}
return version.LT(gitVersion218), nil
}
// FetchRefs fetch git refs from a remote
func (repo *GitRepo) FetchRefs(remote, refSpec string) (string, error) {
stdout, err := repo.runGitCommand("fetch", remote, refSpec)