Browse Source

Fixes caching issue with file history

main
Eric Amodio 5 years ago
parent
commit
6d7f4bdab7
1 changed files with 6 additions and 5 deletions
  1. +6
    -5
      src/git/gitService.ts

+ 6
- 5
src/git/gitService.ts View File

@ -1410,12 +1410,16 @@ export class GitService implements Disposable {
if (options.ref !== undefined) { if (options.ref !== undefined) {
key += `:${options.ref}`; key += `:${options.ref}`;
} }
if (options.maxCount !== undefined) {
options.maxCount = options.maxCount == null ? Container.config.advanced.maxListItems || 0 : options.maxCount;
if (options.maxCount) {
key += `:n${options.maxCount}`; key += `:n${options.maxCount}`;
} }
if (options.renames) { if (options.renames) {
key += ':follow'; key += ':follow';
} }
if (options.reverse) { if (options.reverse) {
key += ':reverse'; key += ':reverse';
} }
@ -1531,11 +1535,8 @@ export class GitService implements Disposable {
range = new Range(range.end, range.start); range = new Range(range.end, range.start);
} }
const maxCount = options.maxCount == null ? Container.config.advanced.maxListItems || 0 : options.maxCount;
const data = await Git.log__file(root, file, ref, { const data = await Git.log__file(root, file, ref, {
...options, ...options,
maxCount: maxCount,
startLine: range === undefined ? undefined : range.start.line + 1, startLine: range === undefined ? undefined : range.start.line + 1,
endLine: range === undefined ? undefined : range.end.line + 1 endLine: range === undefined ? undefined : range.end.line + 1
}); });
@ -1546,7 +1547,7 @@ export class GitService implements Disposable {
file, file,
ref, ref,
await this.getCurrentUser(root), await this.getCurrentUser(root),
maxCount,
options.maxCount,
options.reverse!, options.reverse!,
range range
); );

Loading…
Cancel
Save