Filter files from diverged base branch

myshov · myshov · commit 62dc3cea4817 · 2016-03-21T19:33:26.000+06:00
diff --git a/index.js b/index.js
@@ -10,7 +10,7 @@ function diffBranches(options) {
         throw new gutil.PluginError('gulp-gitflow-diff', 'baseBranch param is required');
     }
 
-    var cmd = 'git diff --name-only ' + options.baseBranch + '..HEAD';
+    var cmd = 'git diff --name-only $(git merge-base ' + options.baseBranch + ' HEAD)..HEAD';
     filesChanged = execSync(cmd, {encoding: 'utf8'});
     filesChanged = filesChanged.split("\n");
     // last entry is just empty string

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ function diffBranches(options) {`
`10`	`10`	`throw new gutil.PluginError('gulp-gitflow-diff', 'baseBranch param is required');`
`11`	`11`	`}`
`12`	`12`
`13`		`- var cmd = 'git diff --name-only ' + options.baseBranch + '..HEAD';`
	`13`	`+ var cmd = 'git diff --name-only $(git merge-base ' + options.baseBranch + ' HEAD)..HEAD';`
`14`	`14`	`filesChanged = execSync(cmd, {encoding: 'utf8'});`
`15`	`15`	`filesChanged = filesChanged.split("\n");`
`16`	`16`	`// last entry is just empty string`