aboutsummaryrefslogtreecommitdiffstats
path: root/repository/gogit.go
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-10-04 19:56:16 +0200
committerMichael Muré <batolettre@gmail.com>2020-10-04 19:56:16 +0200
commit1a0c86a12d68a2f0ee99cbff535c82e07b735108 (patch)
treecd83782c576f2869555913d753de1351ff94a547 /repository/gogit.go
parent9bc2483df054387c1241b2e1644ab7e6e9bc4e9a (diff)
downloadgit-bug-1a0c86a12d68a2f0ee99cbff535c82e07b735108.tar.gz
repo: use go-git in more places, fix push
Diffstat (limited to 'repository/gogit.go')
-rw-r--r--repository/gogit.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/repository/gogit.go b/repository/gogit.go
index b907c070..8fb7c52a 100644
--- a/repository/gogit.go
+++ b/repository/gogit.go
@@ -276,6 +276,9 @@ func (repo *GoGitRepo) FetchRefs(remote string, refSpec string) (string, error)
RefSpecs: []config.RefSpec{config.RefSpec(refSpec)},
Progress: buf,
})
+ if err == gogit.NoErrAlreadyUpToDate {
+ return "already up-to-date", nil
+ }
if err != nil {
return "", err
}
@@ -292,6 +295,9 @@ func (repo *GoGitRepo) PushRefs(remote string, refSpec string) (string, error) {
RefSpecs: []config.RefSpec{config.RefSpec(refSpec)},
Progress: buf,
})
+ if err == gogit.NoErrAlreadyUpToDate {
+ return "already up-to-date", nil
+ }
if err != nil {
return "", err
}