Merge pull request #473 from nodegit/fix-commit-on-head

johnhaley81 · johnhaley81 · commit 82abfdfde64b · 2015-03-07T12:36:32.000-07:00
Fix `createCommitOnHead`
diff --git a/lib/repository.js b/lib/repository.js
@@ -484,14 +484,14 @@ Repository.prototype.createCommitOnHead = function(
   message,
   callback){
   var repo = this;
+  var index;
 
-  return repo.openIndex().then(function(index) {
-    index.read(true);
-
-    filesToAdd.forEach(function(filePath) {
-      index.addByPath(filePath);
-    });
-
+  return repo.openIndex().then(function(index_) {
+    index = index_;
+    index.read(1);
+    return index.addAll();
+  })
+  .then(function() {
     index.write();
 
     return index.writeTree();
@@ -643,8 +643,8 @@ Repository.prototype.fetchAll = function(
 /**
  * Merge a branch onto another branch
  *
- * @param {String|Ref}  from
  * @param {String|Ref}  to
+ * @param {String|Ref}  from
  * @return {Oid|Index}  A commit id for a succesful merge or an index for a
  *                      merge with conflicts
  */
@@ -807,8 +807,8 @@ Repository.prototype.checkoutBranch = function(branch, opts) {
 
     var name = ref.name();
 
-    return repo.setHead(name, 
-      repo.defaultSignature(), 
+    return repo.setHead(name,
+      repo.defaultSignature(),
       "Switch HEAD to " + name);
   })
   .then(function() {
