volker.raschek/dcmerge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

fix(cmd): adapt error message
All checks were successful
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-amd64) (push) Successful in 46s
Details
Run Golang tests / Run unit tests (stable, ubuntu-latest-amd64) (push) Successful in 19s
Details
Lint Markdown files / Run markdown linter (push) Successful in 5s
Details
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-arm64) (push) Successful in 1m47s
Details
Run Golang tests / Run unit tests (stable, ubuntu-latest-arm64) (push) Successful in 58s
Details

Browse Source
This commit is contained in:
Markus Pesch
2025-12-23 00:09:13 +01:00
parent 8c52e19275
commit 6bf1f8a314
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/root.go
View File

@@ -55,7 +55,7 @@ dcmerge docker-compose.yml https://git.example.local/user/repo/docker-compose.ym
func run(cmd *cobra.Command, args []string) error { func run(cmd *cobra.Command, args []string) error {
mergeExisting, err := cmd.Flags().GetBool("existing-win") mergeExisting, err := cmd.Flags().GetBool("existing-win")
if err != nil { if err != nil {
return fmt.Errorf("failed to parse flag last-win: %s", err) return fmt.Errorf("failed to parse flag existing-win: %s", err)
} }
mergeLastWin, err := cmd.Flags().GetBool("last-win") mergeLastWin, err := cmd.Flags().GetBool("last-win")
@@ -78,7 +78,7 @@ func run(cmd *cobra.Command, args []string) error {
for _, config := range dockerComposeConfigs { for _, config := range dockerComposeConfigs {
switch { switch {
case mergeExisting && mergeLastWin: case mergeExisting && mergeLastWin:
return fmt.Errorf("neither --first-win or --last-win can be specified - not booth") return fmt.Errorf("neither --existing-win or --last-win can be specified - not booth")
case mergeExisting && !mergeLastWin: case mergeExisting && !mergeLastWin:
dockerComposeConfig.MergeExistingWin(config) dockerComposeConfig.MergeExistingWin(config)
case !mergeExisting && mergeLastWin: case !mergeExisting && mergeLastWin: