Fixes #56

claudioc · Oct 28, 2014 · 00a310f · 00a310f
1 parent 5804d3c
commit 00a310f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,4 +1,9 @@
 
+Version 1.2.4, October 28st, 2014
+=================================
+
+- Fixes #56 (unrecognized git version)
+
 Version 1.2.3, October 27st, 2014
 =================================
 

diff --git a/jingo b/jingo
@@ -18,7 +18,7 @@ var program = require('commander'),
 
 global.Git = require('./lib/gitmech');
 
-program.version('1.2.3')
+program.version('1.2.4')
        .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')

diff --git a/lib/gitmech.js b/lib/gitmech.js
@@ -102,8 +102,13 @@ var gitMech = {
 
       version = version[2];
 
-      if (version.split('.').length == 4) {
-        version = version.split(".").slice(0, -1).join(".");
+      var splitted = version.split('.');
+      if (splitted.length > 3) {
+        version = splitted.slice(0, 3 - splitted.length).join(".");
+      }
+
+      if (splitted.length == 2) {
+        version = splitted.concat([0]).join('.');
       }
 
       if (!semver.valid(version)) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jingo",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "A nodejs based wiki engine (sort of Gollum port)",
   "author": "Claudio Cicali <[email protected]>",
   "keywords": [