First round of test fixes

Author: John Haley

examples/merge-cleanly.js

@@ -88,7 +88,7 @@ fse.remove(path.resolve(__dirname, repoDir))
     .then(function() {
       return index.write();
     })
-    .then(funcion() {
+    .then(function() {
       return index.writeTree();
     });
 })

generate/input/descriptor.json

@@ -982,6 +982,12 @@
             "isErrorCode": true
           }
         },
+        "git_index_add_bypath": {
+          "isAsync": true,
+          "return": {
+            "isErrorCode": true
+          }
+        },
         "git_index_add_frombuffer": {
           "ignore": true
         },

lib/repository.js

@@ -549,9 +549,13 @@ Repository.prototype.createCommitOnHead = function(
             .then(function() {
               return index.addByPath(filePath);
             });
-        }, Promise.resolve());
-      index.write();
-      return index.writeTree();
+        }, Promise.resolve())
+        .then(function() {
+          return index.write();
+        })
+        .then(function() {
+          return index.writeTree();
+        });
     })
     .then(function(treeOid) {
       return repo.getHeadCommit()
@@ -854,7 +858,6 @@ Repository.prototype.mergeBranches =
           }
 
           // No conflicts so just go ahead with the merge
-          index.write();
           return index.writeTreeTo(repo);
         })
         .then(function(oid) {
@@ -1292,15 +1295,20 @@ Repository.prototype.stageFilemode = function(filePath, stageNew) {
         return Promise.reject("No differences found for this file.");
       }
 
-      pathPatches.forEach(function(pathPatch) {
-        var entry = index.getByPath(pathPatch.newFile().path(), 0);
-
-        entry.mode = stageNew ?
-          pathPatch.newFile().mode() : pathPatch.oldFile().mode();
+      return pathPatches
+        .reduce(function(lastIndexAddPromise, pathPatch) {
+          var entry = index.getByPath(pathPatch.newFile().path(), 0);
 
-        index.add(entry);
-      });
+          entry.mode = stageNew ?
+            pathPatch.newFile().mode() : pathPatch.oldFile().mode();
 
+          return lastIndexAddPromise
+            .then(function() {
+              return index.add(entry);
+            });
+        }, Promise.resolve());
+    })
+    .then(function() {
       return index.write();
     });
 };
@@ -1461,8 +1469,10 @@ Repository.prototype.stageLines =
             !pathPatch[0].isTypeChange();
         }
         if (emptyPatch) {
-          index.addByPath(filePath);
-          return index.write();
+          return index.addByPath(filePath)
+            .then(function() {
+              return index.write();
+            });
         } else {
           return result;
         }
@@ -1514,7 +1524,9 @@ Repository.prototype.stageLines =
       entry.path = filePath;
       entry.fileSize = newBlob.content().length;
 
-      index.add(entry);
+      return index.add(entry);
+    })
+    .then(function() {
       return index.write();
     })
     .then(function(result) {

test/tests/checkout.js

@@ -128,10 +128,13 @@ describe("Checkout", function() {
 
       return test.repository.refreshIndex()
         .then(function(index) {
-          index.addByPath(packageJsonName);
-          index.write();
-
-          return index.writeTree();
+          return index.addByPath(packageJsonName)
+            .then(function() {
+              return index.write();
+            })
+            .then(function() {
+              return index.writeTree();
+            });
         });
     })
     .then(function(oid) {

test/tests/cherrypick.js

@@ -75,8 +75,6 @@ describe("Cherrypick", function() {
       })
       .then(function(index) {
         assert(index);
-        index.write();
-
         return index.writeTreeTo(repo);
       })
       .then(function(oid) {

test/tests/index.js

@@ -80,7 +80,7 @@ describe("Index", function() {
       }));
     })
     .then(function() {
-      index.clear();
+      return index.clear();
     });
   });
 
@@ -131,7 +131,7 @@ describe("Index", function() {
       }));
     })
     .then(function() {
-      index.clear();
+      return index.clear();
     });
   });