ssb-git-repo - npm Package Compare versions

Comparing version 1.8.0 to 1.8.1

lib/repo.js

		@@ -627,3 +627,3 @@ var pull = require('pull-stream')
		// and pull requests merged into HEAD.
		// Read commit messages from last HEAD to current HEAD.
		// Calculate which commits are being merged into HEAD.
		self.getHead(function (err, ref) {
		@@ -636,11 +636,10 @@ var newHead = refUpdatesObj[ref]

		GitRepo(self).resolveRef(ref, function (err, oldHead) {
		if (err && err.name == 'NotFoundError') oldHead = null
		else if (err) return commitsCb(err)
		if (oldHead == newHead)
		return commitsCb(null, [])

		var repo = GitRepo(self)
		// find common ancestor of old HEAD and new HEAD
		GitRepo.getMergeBase(repo, ref, repo, newHead, function (err, base) {
		// read commits from merge base to new HEAD
		pull(
		GitRepo(self).readLog(newHead),
		pull.take(function (rev) { return rev != oldHead }),
		repo.readLog(newHead),
		pull.take(function (rev) { return rev != base }),
		pull.through(function (rev) { console.error('rev', rev) }),
		pull.asyncMap(self.getCommitParsed.bind(self)),
		@@ -647,0 +646,0 @@ pull.collect(commitsCb)

package.json

		{
		"name": "ssb-git-repo",
		"version": "1.8.0",
		"version": "1.8.1",
		"description": "git repos in secure-scuttlebutt",
		@@ -29,3 +29,3 @@ "main": "index.js",
		"pull-git-pack": "^0.2.0",
		"pull-git-repo": "^0.4.0",
		"pull-git-repo": "^0.5.0",
		"pull-hash": "^0.0.0",
		@@ -32,0 +32,0 @@ "pull-pushable": "^2.0.0",

New alerts