Conflicter to handle null file.contents - Fix #950

SBoudrias · SBoudrias · commit 687b9bea3e71 · 2016-11-26T14:19:56.000-08:00
diff --git a/lib/util/conflicter.js b/lib/util/conflicter.js
@@ -181,7 +181,7 @@ Conflicter.prototype._ask = function (file, cb) {
         this.adapter.log.writeln(binaryDiff.diff(file.path, file.contents));
       } else {
         var existing = fs.readFileSync(file.path);
-        this.adapter.diff(existing.toString(), file.contents.toString());
+        this.adapter.diff(existing.toString(), (file.contents || '').toString());
       }
 
       return this._ask(file, cb);

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ Conflicter.prototype._ask = function (file, cb) {`
`181`	`181`	`this.adapter.log.writeln(binaryDiff.diff(file.path, file.contents));`
`182`	`182`	`} else {`
`183`	`183`	`var existing = fs.readFileSync(file.path);`
`184`		`- this.adapter.diff(existing.toString(), file.contents.toString());`
	`184`	`+ this.adapter.diff(existing.toString(), (file.contents \|\| '').toString());`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`return this._ask(file, cb);`