Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
ksonnet
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ijaz Ahmad
ksonnet
Commits
d38f65ee
Unverified
Commit
d38f65ee
authored
7 years ago
by
Alex Clemmer
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #159 from jessicayuen/diff-segfault
Fix segfault for ks diff
parents
812dfa74
93e8d778
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmd/diff.go
+4
-1
4 additions, 1 deletion
cmd/diff.go
with
4 additions
and
1 deletion
cmd/diff.go
+
4
−
1
View file @
d38f65ee
...
...
@@ -44,8 +44,11 @@ var diffCmd = &cobra.Command{
Use
:
"diff [<env1> [<env2>]] [-f <file-or-dir>]"
,
Short
:
"Display differences between server and local config, or server and server config"
,
RunE
:
func
(
cmd
*
cobra
.
Command
,
args
[]
string
)
error
{
if
len
(
args
)
==
0
{
return
fmt
.
Errorf
(
"'diff' requires at least one argument, that is the name of the environment
\n\n
%s"
,
cmd
.
UsageString
())
}
if
len
(
args
)
>
2
{
return
fmt
.
Errorf
(
"'diff' takes at most two arguments, that are the name of the environments
"
)
return
fmt
.
Errorf
(
"'diff' takes at most two arguments, that are the name of the environments
\n\n
%s"
,
cmd
.
UsageString
()
)
}
flags
:=
cmd
.
Flags
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment