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

Modify the require_clean_work_tree function #307

Merged
merged 5 commits into from Jun 18, 2020

Conversation

yashrsharma44
Copy link
Collaborator

Modify the require_clean_work_tree function. Taken from - https://github.com/git/git/blob/master/git-sh-setup.sh#L211

bwplotka and others added 3 commits June 11, 2020 19:39
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>
…hub.com/git/git/blob/master/git-sh-setup.sh#L211

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

Added a git script

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

chmod change

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

changes to git-tree.sh

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

Modified makefile

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

clean up changes

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Jun 15, 2020

Codecov Report

Merging #307 into ci-actions will increase coverage by 0.21%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##           ci-actions     #307      +/-   ##
==============================================
+ Coverage       79.35%   79.56%   +0.21%     
==============================================
  Files              30       30              
  Lines             930      930              
==============================================
+ Hits              738      740       +2     
+ Misses            150      149       -1     
+ Partials           42       41       -1     
Impacted Files Coverage Δ
interceptors/retry/retry.go 78.80% <0.00%> (+1.08%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c1c1b73...8c5c9c8. Read the comment docs.

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>
@bwplotka
Copy link
Collaborator

This makes sense, but can we push it to master? Also worth to fix on Thanos as well??? (: Looks cleaner

@yashrsharma44
Copy link
Collaborator Author

Sure, I will make a pr to Thanos.

@googlebot
Copy link

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

Copy link
Collaborator

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

Awesome, will merge to my PR, looks fine

It would be nice at some point to support custom messages to let use know what's going on, why there is problem for unclean git

@bwplotka
Copy link
Collaborator

@googlebot I consent.

@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@bwplotka bwplotka merged commit 14df35a into grpc-ecosystem:ci-actions Jun 18, 2020
bwplotka added a commit that referenced this pull request Jun 18, 2020
* Moved to GH actions; Added lint; Added issue/PR templates; Fixed vet

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Fixed linter detected issues.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Modify the require_clean_work_tree function (#307)

* Fixed linter detected issues.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Add format-only flag

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

* Modify the require_clean_work_tree function. Taken from - https://github.com/git/git/blob/master/git-sh-setup.sh#L211

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

Added a git script

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

chmod change

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

changes to git-tree.sh

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

Modified makefile

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

clean up changes

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

* Bump timeout deadline to 100ms

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Skipped retry call timeout tests, will fix in later PR.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Fixed race.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

Co-authored-by: Yash Sharma <yashrsharma44@gmail.com>
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.

None yet

4 participants