我如何使用 nodegit 从分支中拉取？

Question

Would appreciate some help with nodegit. I got it to checkout a branch ( branch-development-modular-alpha-2.0.0 ) with:

var cloneRepo = nodegit
.Clone(cloneURL, repoPath, cloneOptions)
.then(function (repo) {
  repo.getBranch('refs/remotes/origin/' + branch).then(function(reference) {
    repo.checkoutRef(reference);

    // Go through repo's submodules
    nodegit.Submodule.foreach(repo, function (submodule) {
      var submoduleName = submodule.name();
      var submoduleURL = submodule.url();
      var submodulePath = repoPath + "/" + submodule.path();

      // Clone the submodule
      nodegit
      .Clone(submoduleURL, submodulePath, cloneOptions)
      .then(function (repo) {
        // TODO: DO SOMETHING.
      })
    })
  })
})

Now I'd like to pull the changes from the same branch and I have something like this however it's not updating with the latest changes from the branch.

nodegit
.Repository
.open(path.resolve(__dirname, repoPath))
.then(function (repo) {
  existingRepository = repo;

  return existingRepository.fetchAll(cloneOptions.fetchOpts);
})
.then(function () {
  return existingRepository.mergeBranches('master', 'refs/remotes/origin/' + branch);
})
.catch(function(error) {
  console.log(error);
})

What am I doing wrong?

Answer 1

A pull would be a fetch + merge.

Except the merge would be origin/master to master.
Or origin/branch to branch.

In your case, the nodegit merge function call should then be:

return existingRepository.mergeBranches(branch, 'refs/remotes/origin/' + branch);

As Jamie Counsell adds in the comments :

I ran into that error too.

It ends up it was because I was retrieving the branch name using nodegit as well, which gave something like origin/refs/heads/master instead of just master .

Calling branch.shorthand() got me " master "

Answer 2

Below is thepull example in nodegit repo:

var nodegit = require("../");
var path = require("path");

var repoDir = "../../test";

var repository;

// Open a repository that needs to be fetched and fast-forwarded
nodegit.Repository.open(path.resolve(__dirname, repoDir))
  .then(function(repo) {
    repository = repo;

    return repository.fetchAll({
      callbacks: {
        credentials: function(url, userName) {
          return nodegit.Cred.sshKeyFromAgent(userName);
        },
        certificateCheck: function() {
          return 0;
        }
      }
    });
  })
  // Now that we're finished fetching, go ahead and merge our local branch
  // with the new one
  .then(function() {
    return repository.mergeBranches("master", "origin/master");
  })
  .done(function() {
    console.log("Done!");
  });