summaryrefslogtreecommitdiff
path: root/go/internal/command/command.go
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-03 10:54:16 +0000
committerNick Thomas <nick@gitlab.com>2019-06-03 10:54:16 +0000
commitbeb5855542645cdc9bf7f954b9c5a9333dfb3975 (patch)
tree3f0059d0a700493460a07d07c15c499b4905854a /go/internal/command/command.go
parent4342831aa40c64e0af3624b934ba0610c22345ba (diff)
parentf6bf0514642703dca4ac3744b6dd0f7757b661e8 (diff)
downloadgitlab-shell-beb5855542645cdc9bf7f954b9c5a9333dfb3975.tar.gz
Merge branch 'id-fallback-for-unimplemented' into 'master'
Return Fallback cmd if feature is enabled, but unimplemented See merge request gitlab-org/gitlab-shell!306
Diffstat (limited to 'go/internal/command/command.go')
-rw-r--r--go/internal/command/command.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/go/internal/command/command.go b/go/internal/command/command.go
index 9589f2f..f55207a 100644
--- a/go/internal/command/command.go
+++ b/go/internal/command/command.go
@@ -22,7 +22,9 @@ func New(arguments []string, config *config.Config, readWriter *readwriter.ReadW
}
if config.FeatureEnabled(string(args.CommandType)) {
- return buildCommand(args, config, readWriter), nil
+ if cmd := buildCommand(args, config, readWriter); cmd != nil {
+ return cmd, nil
+ }
}
return &fallback.Command{RootDir: config.RootDir, Args: arguments}, nil