Check if SHA1 exists before calling git diffon it
#42
Conversation
This file contains 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
asymmetric
force-pushed
the
lorenzo/fix-git-diff
branch
from
aed5553
to
74ff322
Compare
|
@tomwilkie Here's the change from weaveworks/scope#1924. Not sure why the CI build is failing though. |
2opremio
reviewed
Oct 17, 2016
| @@ -40,13 +40,27 @@ commit_timestamp() { | |||
| git show -s --format=%ct "$rev" | |||
| } | |||
|
|
|||
| # is the SHA1 actually present in the repo? | |||
| # it cold be it isn't, e.g. after a force push | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
2opremio
reviewed
Oct 17, 2016
| commit_valid() { | ||
| local rev=$1 | ||
| git rev-parse --quiet --verify "$rev^{commit}" > /dev/null | ||
| [ $? -eq 0 ] |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
asymmetric
force-pushed
the
lorenzo/fix-git-diff
branch
from
74ff322
to
bdffbda
Compare
In the case of a force push, the commit might not exist anymore, and the `git diff` in `has_changes` will fail, but the failure would be silently ignored (since the error message would be passed to `wc`). `wc -l` would return 1, so effectively the same image would be reused over and over.
asymmetric
force-pushed
the
lorenzo/fix-git-diff
branch
from
bdffbda
to
224a145
Compare
|
@2opremio updated, could you please take a look? |
|
The CircleCI build is breaking with golang/lint#246 . Can you try running a more recent version of Go? |
|
I tried changing the Version run by CircleCI to |
|
LGTM, let's fix the build issue separately |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In the case of a force push, the commit will not exist anymore, and the
git diffinhas_changeswill fail, but the failure would be silentlyignored (since the error message would be passed to
wc).wc -lwould return 1, so effectively the same image would be reusedover and over.