Skip to content

Commit a6ea3e3

Browse files
author
Claudio Cicali
committed
Fixes a crash with empty repos
1 parent b821a9c commit a6ea3e3

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

ChangeLog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 1.6.1, January 27th, 2016
2+
==================================
3+
4+
- Fixes #132 (crash on empty repos)
5+
- Renames an img so to not have problems with AdBlock
6+
17
Version 1.6.0, December 28th, 2015
28
==================================
39

jingo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var program = require("commander"),
1717

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

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

6464
if (os.platform() == "darwin" &&
6565
!config.get("application").skipGitCheck &&
66-
config.get("pages").title.fromFilename &&
66+
config.get("pages").title.fromFilename &&
6767
!semver.satisfies(version, ">=1.8.5")) {
6868
console.log("Your current setup uses the filename of the wiki page as the page title.");
6969
console.log("Unfortunately this version of git (" + version + ".x) on OSX doesn't handle");

lib/gitmech.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,8 @@ var gitMech = {
285285
hashes: function (path, howMany, callback) {
286286

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

291292
},

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jingo",
3-
"version": "1.6.0",
3+
"version": "1.6.1",
44
"description": "A nodejs based wiki engine",
55
"author": "Claudio Cicali <claudio.cicali@gmail.com>",
66
"keywords": [

public/css/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ li {
601601
}
602602

603603
a.btn-auth {
604-
background-image: url(../img/social-logins.png);
604+
background-image: url(../img/login-providers.png);
605605
background-repeat: no-repeat;
606606
display: block;
607607
height: 5rem;
File renamed without changes.

0 commit comments

Comments
 (0)