Skip to content

Fix new git based diff generation file paths #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 2, 2020
Merged

Fix new git based diff generation file paths #147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e73f234
Fix new git based diff generation file paths
eseliger Mar 1, 2020
356be22
Update cmd/src/actions_exec_backend_runner.go
mrnugget Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmd/src/actions_exec_backend_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down