diff options
| author | cel <cel@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519> | 2018-01-09 22:02:17 -1000 |
|---|---|---|
| committer | cel <cel@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519> | 2018-01-09 22:02:17 -1000 |
| commit | 7052ddce7a33724467c076dff4217c73001d4a8c (patch) | |
| tree | 4a8f402ce9b3d8e52f5e133001859cef35d70eb4 | |
| parent | afc315b47e13e5a98eb37b9b56a0d36571d1c4a9 (diff) | |
| download | patchfoo-7052ddce7a33724467c076dff4217c73001d4a8c.tar.gz patchfoo-7052ddce7a33724467c076dff4217c73001d4a8c.zip | |
Use correct message ids in commit file diff links
| -rw-r--r-- | lib/serve.js | 5 | ||||
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/serve.js b/lib/serve.js index 5ba0004..793ad84 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -1799,6 +1799,7 @@ Serve.prototype.gitCommit = function (rev) { ph('table', pull( self.app.git.readCommitChanges(commit), pull.map(function (file) { + var msg = file.msg || obj.msg return ph('tr', [ ph('td', ph('code', u.escapeHTML(file.name))), ph('td', file.deleted ? 'deleted' @@ -1806,13 +1807,13 @@ Serve.prototype.gitCommit = function (rev) { ph('a', {href: self.app.render.toUrl('/git/blob/' + (file.hash[1] || file.hash[0]) - + '?msg=' + encodeURIComponent(obj.msg.key)) + + '?msg=' + encodeURIComponent(msg.key)) }, 'created') : file.hash ? ph('a', {href: self.app.render.toUrl('/git/diff/' + file.hash[0] + '..' + file.hash[1] - + '?msg=' + encodeURIComponent(obj.msg.key)) + + '?msg=' + encodeURIComponent(msg.key)) + '&commit=' + rev + '&path=' + encodeURIComponent(file.name) }, 'changed') diff --git a/package-lock.json b/package-lock.json index 43d981e..8533e05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1219,9 +1219,9 @@ } }, "ssb-git": { - "version": "0.6.0", - "resolved": "http://localhost:8989/blobs/get/&tz2WDecaYFjrKmRdZmLW9hu1DF7oYD+rNzAzaObqF5I=.sha256", - "integrity": "sha256-tz2WDecaYFjrKmRdZmLW9hu1DF7oYD+rNzAzaObqF5I=", + "version": "0.7.0", + "resolved": "http://localhost:8989/blobs/get/&YaFMXaoXkA4IA5A2FkfPJ/u+8k+3k6MLuDm09yeShdg=.sha256", + "integrity": "sha256-YaFMXaoXkA4IA5A2FkfPJ/u+8k+3k6MLuDm09yeShdg=", "requires": { "asyncmemo": "1.1.0", "hashlru": "http://localhost:8989/blobs/get/&EASZ1/L+jHuTVxrgbQrNlTdCenA8etAVuk/TGn92RoY=.sha256", diff --git a/package.json b/package.json index 37d3ca4..7c04857 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "pull-utf8-decoder": "^1.0.2", "ssb-client": "http://localhost:8989/blobs/get/&EAaUpI+wrJM5/ly1RqZW0GAEF4PmCAmABBj7e6UIrL0=.sha256", "ssb-contact": "^1.2.0", - "ssb-git": "^0.6.0", + "ssb-git": "^0.7.0", "ssb-marked": "^0.7.1", "ssb-mentions": "http://localhost:8989/blobs/get/&GjuxknqKwJqHznKueFNCyIh52v1woz5PB41vqmoHfyM=.sha256", "ssb-sort": "^1.0.0", |