Skip to content

Commit

Permalink
Fixes a crash with empty repos
Browse files Browse the repository at this point in the history
  • Loading branch information
Claudio Cicali committed Jan 27, 2016
1 parent b821a9c commit a6ea3e3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
6 changes: 6 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Version 1.6.1, January 27th, 2016
==================================

- Fixes #132 (crash on empty repos)
- Renames an img so to not have problems with AdBlock

Version 1.6.0, December 28th, 2015
==================================

Expand Down
4 changes: 2 additions & 2 deletions jingo
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var program = require("commander"),

global.Git = require("./lib/gitmech");

program.version("1.6.0")
program.version("1.6.1")
.option("-c, --config <path>", "Specify the config file")
.option("-#, --hash-string <string>", "Create an hash for a string")
.option("-l, --local", "Listen on localhost only")
Expand Down Expand Up @@ -63,7 +63,7 @@ Git.setup(config.get("application").git,

if (os.platform() == "darwin" &&
!config.get("application").skipGitCheck &&
config.get("pages").title.fromFilename &&
config.get("pages").title.fromFilename &&
!semver.satisfies(version, ">=1.8.5")) {
console.log("Your current setup uses the filename of the wiki page as the page title.");
console.log("Unfortunately this version of git (" + version + ".x) on OSX doesn't handle");
Expand Down
3 changes: 2 additions & 1 deletion lib/gitmech.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ var gitMech = {
hashes: function (path, howMany, callback) {

gitSpawn(["log", "-" + howMany, "--reverse", "--no-notes", "--pretty=format:%h", "--", docSubdir + path], function (err, data) {
callback(null, data.toString().split("\n"));
var result = (data && !err) ? data.toString().split("\n") : [];
callback(err, result);
});

},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jingo",
"version": "1.6.0",
"version": "1.6.1",
"description": "A nodejs based wiki engine",
"author": "Claudio Cicali <claudio.cicali@gmail.com>",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ li {
}

a.btn-auth {
background-image: url(../img/social-logins.png);
background-image: url(../img/login-providers.png);
background-repeat: no-repeat;
display: block;
height: 5rem;
Expand Down
File renamed without changes

0 comments on commit a6ea3e3

Please sign in to comment.