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

tabs to spaces #1666

Merged
merged 5 commits into from
Nov 4, 2016
Merged

Conversation

connortechnology
Copy link
Member

The ongoing work to fix the whitespace/google code style

@kylejohnson
Copy link
Member

I think a criteria for this getting merged is that the number of changes (additions and deletions) stays equal; that'll help us to clearly see that this PR was only for what it should be.

@connortechnology
Copy link
Member Author

I don't see why the # of lines would change. I think git is just being stupid.

@connortechnology
Copy link
Member Author

yeah something must have gone wrong. let me fix it.

@connortechnology
Copy link
Member Author

So git diff -w master shows no changes....

@connortechnology
Copy link
Member Author

Oh hey, # of changes is the same.... let's merge.

Copy link
Member

@kylejohnson kylejohnson left a comment

Choose a reason for hiding this comment

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

In ConfigData.pm.in (can't inline as file is too large) there are some lines like this:

+ boolean => {
+ db_type     =>"boolean",
+ hint        =>"yes|no",
+ pattern     =>qr|^([yn])|i,
+ check       =>q( $1 ),
+ format      =>q( ($1 =~ /^y/)
+     ? "yes"
+     : "no"
+     )
+ },

which don't match up with these:

+ integer => {
+   db_type     =>"integer",
+   hint        =>"integer",
+   pattern     =>qr|^(\d+)$|,
+   format      =>q( $1 )
+ },

Didn't catch anything else obvious but man, lots-o-changes.

@connortechnology
Copy link
Member Author

I'm so confused now which branch is which, but I think I've got it cleaned up. I don't want to do any more changes at this time because it is already too big to view here.

@kylejohnson kylejohnson merged commit ae0afae into ZoneMinder:master Nov 4, 2016
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.

2 participants