Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for dirty files is not accurate #826

Merged
merged 1 commit into from
Aug 12, 2014

Conversation

smarterclayton
Copy link
Contributor

grep '^M' was not returning anything. In general diff-index and
ls-files are preferred to status --porcelain.

Could use some testing.

@@ -1,5 +1,7 @@
#!/bin/bash

echo "foo"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debug code?

@smarterclayton
Copy link
Contributor Author

Facepalm

@lavalamp
Copy link
Member

lavalamp commented Aug 7, 2014

LGTM; should someone else give this a try before we merge?

@smarterclayton
Copy link
Contributor Author

I think so

@derekwaynecarr
Copy link
Member

I can test this and report back.

@lavalamp
Copy link
Member

@derekwaynecarr did you end up trying this?

@derekwaynecarr
Copy link
Member

@lavalamp @smarterclayton - I tried this. I think the message echo to terminal is no longer accurate with the observed results. The script refused to update anything if I had anything in my git status results - even if the content was untracked by git and never staged for commit. I see that we ignore .gitignore content in this update, but if the desire is to inspect untracked files as well, we should clarify that in the echo comment.

@smarterclayton
Copy link
Contributor Author

Untracked content should probably be flagged because the script runs git add src/ - we don't want to accidentally grab something you touched outside of it. I guess I could subset it to that path. Is not having any untracked files in your repo a burden?

@derekwaynecarr
Copy link
Member

@smarterclayton its not uncommon for me to keep a temp file in my workspace that has notes on the thing i am working on. It's not a major issue for me to require a clean workspace, just make the comment state that clearly "Before updating third-pary code, you must have no staged or untracked files (i.e. git status returns no results)."

grep '^M' was not returning anything. In general diff-index and
ls-files are preferred to status --porcelain.
@smarterclayton
Copy link
Contributor Author

@derekwaynecarr I made it only check for unclean files in third_party/src

@derekwaynecarr
Copy link
Member

LGTM

lavalamp added a commit that referenced this pull request Aug 12, 2014
Check for dirty files is not accurate
@lavalamp lavalamp merged commit a3d5d91 into kubernetes:master Aug 12, 2014
@smarterclayton smarterclayton deleted the git_check_wrong branch February 11, 2015 02:21
seans3 pushed a commit to seans3/kubernetes that referenced this pull request Apr 10, 2019
b3atlesfan pushed a commit to b3atlesfan/kubernetes that referenced this pull request Feb 5, 2021
kube-flannel.yaml: Update manifests to latest release
marun pushed a commit to marun/kubernetes that referenced this pull request Jul 1, 2021
…rry-pick-804-to-release-4.7

[release-4.7] Bug 1975553: only chown if non-windows machine with projected volumes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants