From fd66ef9970c40d8da35c1f605fb0b4d8e07405ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Sko=C5=99epa?= <jakub@skorepa.info>
Date: Mon, 18 Apr 2016 23:17:04 +0200
Subject: [PATCH] Fix no merge warning + fix modification date
---
sitegin/gitInfo.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/sitegin/gitInfo.js b/sitegin/gitInfo.js
index 7920c33..fed2ed2 100644
--- a/sitegin/gitInfo.js
+++ b/sitegin/gitInfo.js
@@ -183,14 +183,18 @@ module.exports = function(obj) {
article.metadata.date = {};
if(article.metadata.date.creation === undefined) {
- if(mergeCommit === undefined)
+ if(mergeCommit === undefined) {
+ console.log('[Warning] Article '+ file +' does not have merge commit.');
article.metadata.date.creation = moment();
- else
+ } else
article.metadata.date.creation = mergeCommit.date;
}
article.metadata.date.modification = newestCommit.date;
- article.metadata.date.modified = (newestCommit !== oldestCommit);
+ var sameDay = function(a,b) {
+ return a.getYear()==b.getYear() && a.getMonth() == b.getMonth() && a.getDate() == b.getDate();
+ }
+ article.metadata.date.modified = !sameDay(newestCommit.date, oldestCommit.date);
if(article.metadata.author === undefined)
article.metadata.author = {}
@@ -201,7 +205,7 @@ module.exports = function(obj) {
article.commits = commits;
} else {
- console.log('[Warning] Article '+ file +' is not in git repository or doesn\'t have merge commit');
+ console.log('[Warning] Article '+ file +' is not in git repository.');
}
});
return obj;
--
GitLab