Fix new git based diff generation file paths (#147)

eseliger · mrnugget · web-flow · commit 44008e19e2a6 · 2020-03-02T11:48:11.000+01:00
* Fix new git based diff generation file paths

* Update cmd/src/actions_exec_backend_runner.go

Co-authored-by: Thorsten Ball &lt;mrnugget@gmail.com&gt;
diff --git a/cmd/src/actions_exec_backend_runner.go b/cmd/src/actions_exec_backend_runner.go
@@ -239,7 +239,11 @@ func runAction(ctx context.Context, prefix, repoID, repoName, rev string, steps
 		return nil, errors.Wrap(err, "git add failed")
 	}
 
-	diffOut, err := runGitCmd("diff", "--cached")
+	// As of Sourcegraph 3.14 we only support unified diff format.
+	// That means we need to strip away the `a/` and `/b` prefixes with `--no-prefix`.
+	// See: https://github.com/sourcegraph/sourcegraph/blob/82d5e7e1562fef6be5c0b17f18631040fd330835/enterprise/internal/campaigns/service.go#L324-L329
+	// 
+	diffOut, err := runGitCmd("diff", "--cached", "--no-prefix")
 	if err != nil {
 		return nil, errors.Wrap(err, "git diff failed")
 	}

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,11 @@ func runAction(ctx context.Context, prefix, repoID, repoName, rev string, steps`
`239`	`239`	`return nil, errors.Wrap(err, "git add failed")`
`240`	`240`	`}`
`241`	`241`
`242`		`- diffOut, err := runGitCmd("diff", "--cached")`
	`242`	`+ // As of Sourcegraph 3.14 we only support unified diff format.`
	`243`	+ // That means we need to strip away the `a/` and `/b` prefixes with `--no-prefix`.
	`244`	`+ // See: https://github.com/sourcegraph/sourcegraph/blob/82d5e7e1562fef6be5c0b17f18631040fd330835/enterprise/internal/campaigns/service.go#L324-L329`
	`245`	`+ //`
	`246`	`+ diffOut, err := runGitCmd("diff", "--cached", "--no-prefix")`
`243`	`247`	`if err != nil {`
`244`	`248`	`return nil, errors.Wrap(err, "git diff failed")`
`245`	`249`	`}`