more protobuf changes

1 files changed, 17 insertions, 19 deletions

diff --git a/gitConfig.proto b/gitConfig.proto
index 0de9cd0..094e204 100644
--- a/gitConfig.proto
+++ b/gitConfig.proto
@@ -4,29 +4,27 @@ package gitpb;
 
 import "google/protobuf/timestamp.proto"; // Import the well-known type for Timestamp
 
-message GitRemote {                                   // `autogenpb:nomutex`
-        string                   url            = 1;
-        string                   fetch          = 2;
+message GitRemote {                                // `autogenpb:nomutex`
+        string                name           = 1;  // the branch name from the config file
+        string                url            = 2;
+        string                fetch          = 3;
 }
 
-message GitBranch {                                   // `autogenpb:nomutex`
-        string                   remote         = 1;  // the name of the remote repo
-        string                   merge          = 2;  // the merge path from the config file
-        string                   name           = 3;  // the branch name from the config file
+message GitBranch {                                // `autogenpb:nomutex`
+        string                name           = 1;  // the branch name from the config file
+        string                remote         = 2;  // the name of the remote repo
+        string                merge          = 3;  // the merge path from the config file
 }
 
-message GitConfig {                                   // `autogenpb:nomutex`
-        map<string, string>      core           = 1;  // map[origin] = "https:/git.wit.org/gui/gadgets"
-        map<string, GitRemote>   remotes        = 2;  // map[origin] = "https:/git.wit.org/gui/gadgets"
-        map<string, GitBranch>   branches       = 3;  // map[guimaster] = origin guimaster
-        map<string, string>      submodules     = 4;
-        map<string, string>      hashes         = 5;
-        map<string, string>      versions       = 6;
-        repeated GitBranch       local          = 7;  // move this away from the map<> variables
+message GitConfig {                                // `autogenpb:nomutex`
+        map<string, string>   core           = 1;  // map[origin] = "https:/git.wit.org/gui/gadgets"
+        map<string, string>   submodules     = 2;
+        repeated GitBranch    branches       = 3;  // move this away from the map<> variables
+        repeated GitRemote    remotes        = 4;  // move this away from the map<> variables
 }
 
-message GitConfigs {                                  // `autogenpb:marshal` `autogenpb:mutex`
-        string                   uuid           = 1;  // `autogenpb:uuid:e70b71ec-0326-4485-8460-4a3c4d7b6919`
-        string                   version        = 2;  // `autogenpb:version:v0.0.1`
-        repeated GitConfig       GitConfigs     = 3;  // THIS MUST BE  GitConfig  and then  GitConfigs
+message GitConfigs {                               // `autogenpb:marshal` `autogenpb:mutex`
+        string                uuid           = 1;  // `autogenpb:uuid:e70b71ec-0326-4485-8460-4a3c4d7b6919`
+        string                version        = 2;  // `autogenpb:version:v0.0.1`
+        repeated GitConfig    GitConfigs     = 3;  // THIS MUST BE  GitConfig  and then  GitConfigs
 }