mirror of
https://github.com/fiatjaf/nak.git
synced 2026-10-05 15:18:23 +00:00
Merge pull request #175 from mattn/fix/git-init-interactive-discard
git: init --interactive was discarding the prompted identifier and owner
This commit is contained in:
@@ -246,11 +246,12 @@ aside from those, there is also:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// override with flags and existing config
|
// override with flags and existing config
|
||||||
config.Identifier = getValue(existingConfig.Identifier, c.String("identifier"), config.Identifier)
|
// (identifier and ownerStr already hold the flag value, the interactive answer or the default)
|
||||||
|
config.Identifier = identifier
|
||||||
config.Name = getValue(existingConfig.Name, c.String("name"), config.Name)
|
config.Name = getValue(existingConfig.Name, c.String("name"), config.Name)
|
||||||
config.Description = getValue(existingConfig.Description, c.String("description"), config.Description)
|
config.Description = getValue(existingConfig.Description, c.String("description"), config.Description)
|
||||||
config.Web = getSliceValue(existingConfig.Web, c.StringSlice("web"), config.Web)
|
config.Web = getSliceValue(existingConfig.Web, c.StringSlice("web"), config.Web)
|
||||||
config.Owner = getValue(existingConfig.Owner, c.String("owner"), config.Owner)
|
config.Owner = ownerStr
|
||||||
config.GraspServers = getSliceValue(existingConfig.GraspServers, c.StringSlice("grasp-servers"), config.GraspServers)
|
config.GraspServers = getSliceValue(existingConfig.GraspServers, c.StringSlice("grasp-servers"), config.GraspServers)
|
||||||
config.EarliestUniqueCommit = getValue(existingConfig.EarliestUniqueCommit, c.String("earliest-unique-commit"), config.EarliestUniqueCommit)
|
config.EarliestUniqueCommit = getValue(existingConfig.EarliestUniqueCommit, c.String("earliest-unique-commit"), config.EarliestUniqueCommit)
|
||||||
maintainers := getSliceValue(existingConfig.Maintainers, c.StringSlice("maintainers"), config.Maintainers)
|
maintainers := getSliceValue(existingConfig.Maintainers, c.StringSlice("maintainers"), config.Maintainers)
|
||||||
|
|||||||
Reference in New Issue
Block a user