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.

Sign up for GitHub

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

Jump to bottom

Remove zfs_gitrev.h #8054

Merged
merged 1 commit into from
Oct 24, 2018
Merged

Remove zfs_gitrev.h #8054

merged 1 commit into from
Oct 24, 2018

Conversation

behlendorf
Copy link
Contributor

@behlendorf behlendorf commented Oct 24, 2018 •
edited
Loading

This file was intended to be ignored.

Motivation and Context

This generated file was accidentally included in a previous commit, 80a91e7,
and should not be included in the repository.

How Has This Been Tested?

Local build.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

@behlendorf
Remove zfs_gitrev.h
01e4351 
This generated file was accidentally included in a previous commit
and should not be included in the repository.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Oct 24, 2018
ahrens
ahrens approved these changes Oct 24, 2018
View reviewed changes
Copy link
Member

@ahrens ahrens left a comment

Choose a reason for hiding this comment

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

does the .gitignore not help prevent this?

@ahrens ahrens added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Oct 24, 2018
@behlendorf
Copy link
Contributor Author

@ahrens it should by preventing git add -u from adding the modified file to the commit.

@ahrens
Copy link
Member

ahrens commented Oct 24, 2018

Confirmed that git add -u, git add -A, and git add include/zfs_gitrev.h don't add this file. Only git add -f include/zfs_gitrev.h does.

@behlendorf behlendorf merged commit b3d7725 into openzfs:master Oct 24, 2018
@codecov
Copy link

codecov bot commented Oct 25, 2018

Codecov Report

Merging #8054 into master will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8054      +/-   ##
==========================================
+ Coverage    78.5%   78.52%   +0.01%     
==========================================
  Files         377      377              
  Lines      114447   114447              
==========================================
+ Hits        89850    89870      +20     
+ Misses      24597    24577      -20
Flag Coverage Δ
#kernel 78.79% <ø> (ø) ⬆️
#user 67.36% <ø> (-0.12%) ⬇️

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 e871a8f...01e4351. Read the comment docs.

ghfields pushed a commit to ghfields/zfs that referenced this pull request Oct 29, 2018
@behlendorf @ghfields
Remove zfs_gitrev.h
05767ec 
This generated file was accidentally included in previous commit,
80a91e7, and should not be included in the repository.

Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed by: Don Brady <don.brady@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8054
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Nov 4, 2018
@behlendorf @BrainSlayer
Remove zfs_gitrev.h
164bf9c 
This generated file was accidentally included in previous commit,
80a91e7, and should not be included in the repository.

Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed by: Don Brady <don.brady@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8054
GregorKopka pushed a commit to GregorKopka/zfs that referenced this pull request Jan 7, 2019
@behlendorf
Remove zfs_gitrev.h
a6be564 
This generated file was accidentally included in previous commit,
80a91e7, and should not be included in the repository.

Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed by: Don Brady <don.brady@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8054
@behlendorf behlendorf deleted the gitignore-gitrev branch April 19, 2021 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahrens ahrens ahrens approved these changes

@gmelikov gmelikov gmelikov approved these changes

@tonyhutter tonyhutter tonyhutter approved these changes

@don-brady don-brady don-brady approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@behlendorf @ahrens @gmelikov @tonyhutter @don-brady