Add "returning" option for merge output ref#262
Merged
Conversation
vito
requested changes
May 28, 2019
vito
left a comment
vito
left a comment
Member
There was a problem hiding this comment.
Thanks, this looks great! Just need a tiny tweak to the test file in order to run the newly added test. 👍
Setting the `returning` param to `unmerged` allows using the original commit as the resource output when setting the `merge` param to `true`. Resolves concourse#253 Signed-off-by: Rob Liebowitz <rliebowitz@morningconsult.com>
Contributor
Author
|
@vito -- Looks like the Ubuntu test fails sometimes, so I had to re-trigger the build (with an amend/force-push) to get it to pass. There are other examples of the same error in the build history (26, 18), so I don't think it's related to this change. Other than that, the PR should be good to go. |
vito
approved these changes
May 29, 2019
vito
left a comment
vito
left a comment
Member
There was a problem hiding this comment.
😕 Yeah those GPG tests seem a little finnicky. We'll keep an eye on it. Thanks!
jamieklassen
pushed a commit
to vmware-archive/release-notes
that referenced
this pull request
Jun 6, 2019
concourse/git-resource#262 Signed-off-by: James Thomson <jthomson@pivotal.io> Co-authored-by: Jamie Klassen <cklassen@pivotal.io>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Setting the
returningparam tounmergedallows using the original commit as the resource output when setting themergeparam totrue, rather than using the merge commit. This is a backward compatible change that allows users to opt-in to the new behavior as desired.Resolves #253