Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Conversation

@vanessayuenn
Copy link
Contributor

fixes #1853

@vanessayuenn vanessayuenn requested a review from a team December 19, 2018 15:58
@codecov
Copy link

codecov bot commented Dec 19, 2018

Codecov Report

Merging #1855 into master will decrease coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1855      +/-   ##
==========================================
- Coverage   91.15%   91.14%   -0.02%     
==========================================
  Files         196      196              
  Lines       10744    10745       +1     
  Branches     1575     1575              
==========================================
- Hits         9794     9793       -1     
- Misses        950      952       +2
Impacted Files Coverage Δ
lib/containers/pr-changed-files-container.js 100% <100%> (ø) ⬆️
lib/atom/gutter.js 89.74% <0%> (-2.57%) ⬇️
lib/atom/decoration.js 84.33% <0%> (-1.21%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 278e871...0d1f597. Read the comment docs.

Copy link

@annthurium annthurium left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @vanessayuenn for fixing!

Left one question, but it's non blocking.


buildPatch(rawDiff) {
const diffs = parseDiff(rawDiff);
const diffs = parseDiff(rawDiff).map(diff => {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we also need to worry about where we're using parseDiff in git-shell-out-strategy? If so, we should consider extracting this functionality to some kind of helper.

I seem to remember some chatter that git gives us different output than the REST api does, so this might not actually be a problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I seem to remember some chatter that git gives us different output than the REST api does,

Indeed! It is a git diff default behaviour to use a/ to prefix the source file and b/ to prefix the destination file. In git-shell-out-strategy, we work around this by using --no-prefix flag to get diffs, but for changed files tab, we don't have that option since we're getting the diff from the REST API.

@vanessayuenn vanessayuenn merged commit 0e013b6 into master Dec 20, 2018
@vanessayuenn vanessayuenn deleted the vy/fix-wrong-prefix branch December 20, 2018 11:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Changed files tabs show inaccurate file paths

3 participants