Skip helm get hooks when --three-way-merge=true
#423
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hooks manifests would have been already added when
--three-way-merge=true(bygenManifestfunction). Unless--no-hooks=truehave been supplied as well - making them being skipped earlier as well.This results into only one case when hooks manifests should be added separately:
--three-way-merge=false --no-hooks=false(the current defaults).With the current code however, when charts contain hooks and
--three-way-merge=true, some confusing output is returned (esp. on empty diff). That's because hooks manifests are added twice: first insidegenManifestfunction, and then again by appending results ofgetHooksfunction.The exit code is
0, though. A user thinking could be:helm difffail, but did not reflect that in exit code?Errorit could have missed diffing at all?Erroror is it empty indeed?Perhaps, replacing
ErrorwithWarningin the message would make sense as well.