Fixes diff w/prev from diff view w/working changes

eamodio · eamodio · commit b6a1b928f16e · 2019-06-10T22:45:17.000-04:00
diff --git a/src/git/gitService.ts b/src/git/gitService.ts
@@ -1748,10 +1748,12 @@ export class GitService implements Disposable {
                     };
                 }
                 else if (status.workingTreeStatus !== undefined) {
-                    return {
-                        current: GitUri.fromFile(fileName, repoPath, undefined),
-                        previous: await this.getPreviousUri(repoPath, uri, undefined, skip)
-                    };
+                    if (skip === 0) {
+                        return {
+                            current: GitUri.fromFile(fileName, repoPath, undefined),
+                            previous: await this.getPreviousUri(repoPath, uri, undefined, skip)
+                        };
+                    }
                 }
             }
             else if (skip === 0) {

Original file line number	Diff line number	Diff line change
`@@ -1748,10 +1748,12 @@ export class GitService implements Disposable {`
`1748`	`1748`	`};`
`1749`	`1749`	`}`
`1750`	`1750`	`else if (status.workingTreeStatus !== undefined) {`
`1751`		`- return {`
`1752`		`- current: GitUri.fromFile(fileName, repoPath, undefined),`
`1753`		`- previous: await this.getPreviousUri(repoPath, uri, undefined, skip)`
`1754`		`- };`
	`1751`	`+ if (skip === 0) {`
	`1752`	`+ return {`
	`1753`	`+ current: GitUri.fromFile(fileName, repoPath, undefined),`
	`1754`	`+ previous: await this.getPreviousUri(repoPath, uri, undefined, skip)`
	`1755`	`+ };`
	`1756`	`+ }`
`1755`	`1757`	`}`
`1756`	`1758`	`}`
`1757`	`1759`	`else if (skip === 0) {`