summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorforge <[email protected]>2025-10-02 15:14:07 -0500
committerJeff Carr <[email protected]>2025-10-03 12:12:30 -0500
commitd9e303b50cbb11bb781c8173e028a89131c947ca (patch)
treed3f8227e0a528efcefa8a27b82add442b65ab307
parentd91fa140ba3808b056ca2c2aed126a978601dfe3 (diff)
fix repo.URL on .git/config reload()v0.0.141
-rw-r--r--reload.go11
-rw-r--r--reloadParseGitConfig.go11
2 files changed, 11 insertions, 11 deletions
diff --git a/reload.go b/reload.go
index bd6844f..9b79ad9 100644
--- a/reload.go
+++ b/reload.go
@@ -61,18 +61,17 @@ func (repo *Repo) ReloadForce() error {
repo.reloadVersions()
repo.setRepoType()
+ if repo.didFileChange(".git/config", repo.Times.MtimeConfig) {
+ if err := repo.updateGitConfig(); err != nil {
+ log.Infof("%s .git/config parse error %v\n", repo.FullPath, err)
+ }
+ }
// this is probably a good place & time to store these
repo.reloadMtimes()
repo.CheckDirty()
repo.setRepoState()
- if repo.GitConfig == nil {
- if err := repo.updateGitConfig(); err != nil {
- return err
- }
- }
-
// repo.VerifyRemoteAndLocalBranches(repo.GetDevelBranchName())
// repo.VerifyRemoteAndLocalBranches(repo.GetMasterBranchName())
diff --git a/reloadParseGitConfig.go b/reloadParseGitConfig.go
index 7d63020..3497754 100644
--- a/reloadParseGitConfig.go
+++ b/reloadParseGitConfig.go
@@ -28,16 +28,17 @@ func (repo *Repo) updateGitConfig() error {
repo.GitConfig.Versions = make(map[string]string)
repo.GitConfig.Hashes = make(map[string]string)
url, err := repo.readGitConfig()
- if repo.URL != "" {
- log.Info("gitpb: url already set", url, repo.URL)
+ if repo.URL == "" {
+ repo.URL = url
+ }
+ if repo.URL != url {
+ log.Info("gitpb: updated URL:", url, repo.URL)
+ repo.URL = url
}
if url == "" {
log.Info(repo.FullPath, "url was blank. warn user this repo is only on the local disk")
- } else {
- repo.URL = url
}
-
return err
}