mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Misc code style fixes
This commit is contained in:
@@ -115,4 +115,4 @@ namespace loot {
|
||||
bool Version::operator != (const Version& ver) const {
|
||||
return pseudosem::compare(this->verString, ver.AsString()) != 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,8 +136,8 @@ namespace loot {
|
||||
// Branch doesn't exist. Create a new branch using the remote branch's latest commit.
|
||||
git.CheckoutNewBranch("origin", repoBranch);
|
||||
else {
|
||||
// The local branch exists. Need to merge the remote branch
|
||||
// into it.
|
||||
// The local branch exists. Need to merge the remote branch
|
||||
// into it.
|
||||
git.Call(ret); // Handle other errors from preceding branch lookup.
|
||||
|
||||
// Check if HEAD points to the desired branch and set it to if not.
|
||||
@@ -207,9 +207,11 @@ namespace loot {
|
||||
BOOST_LOG_TRIVIAL(info) << "Local branch and masterlist file are already up to date.";
|
||||
return false;
|
||||
}
|
||||
} else
|
||||
}
|
||||
else
|
||||
BOOST_LOG_TRIVIAL(trace) << "Local branch heads is ahead of remote branch head.";
|
||||
} else
|
||||
}
|
||||
else
|
||||
BOOST_LOG_TRIVIAL(trace) << "Local branch can be fast-forwarded to remote branch.";
|
||||
|
||||
if (updateBranchHead) {
|
||||
|
||||
@@ -73,4 +73,4 @@ namespace YAML {
|
||||
|
||||
return out;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,4 +63,4 @@ namespace YAML {
|
||||
|
||||
return out;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,4 +105,4 @@ namespace YAML {
|
||||
|
||||
return out;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,4 +74,4 @@ namespace YAML {
|
||||
|
||||
return out;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -158,7 +158,7 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
// Initialise CEF settings.
|
||||
CefSettings cef_settings = GetCefSettings();
|
||||
|
||||
|
||||
#ifndef _WIN32
|
||||
// Install xlib error handlers so that the application won't be terminated
|
||||
// on non-fatal errors.
|
||||
|
||||
Reference in New Issue
Block a user