Bladeren bron

Changes commit type repo to branch

main
Eric Amodio 7 jaren geleden
bovenliggende
commit
640a11b3cb
4 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. +1
    -1
      src/commands/showQuickCommitDetails.ts
  2. +1
    -1
      src/git/models/commit.ts
  3. +1
    -1
      src/git/parsers/logParser.ts
  4. +1
    -1
      src/gitService.ts

+ 1
- 1
src/commands/showQuickCommitDetails.ts Bestand weergeven

@ -46,7 +46,7 @@ export class ShowQuickCommitDetailsCommand extends ActiveEditorCachedCommand {
}
try {
if (!commit || (commit.type !== 'repo' && commit.type !== 'stash')) {
if (!commit || (commit.type !== 'branch' && commit.type !== 'stash')) {
if (repoLog) {
commit = repoLog.commits.get(sha);
// If we can't find the commit, kill the repoLog

+ 1
- 1
src/git/models/commit.ts Bestand weergeven

@ -34,7 +34,7 @@ export interface IGitCommitLine {
code?: string;
}
export type GitCommitType = 'blame' | 'file' | 'repo' | 'stash';
export type GitCommitType = 'blame' | 'branch' | 'file' | 'stash';
export class GitCommit implements IGitCommit {

+ 1
- 1
src/git/parsers/logParser.ts Bestand weergeven

@ -96,7 +96,7 @@ export class GitLogParser {
break;
case 'filename':
if (type === 'repo') {
if (type === 'branch') {
const nextLine = lines[position + 1];
// If the next line isn't blank, make sure it isn't starting a new commit
if (nextLine && Git.shaRegex.test(nextLine)) continue;

+ 1
- 1
src/gitService.ts Bestand weergeven

@ -541,7 +541,7 @@ export class GitService extends Disposable {
try {
const data = await Git.log(repoPath, sha, maxCount, reverse);
return GitLogParser.parse(data, 'repo', repoPath, undefined, sha, maxCount, reverse, undefined);
return GitLogParser.parse(data, 'branch', repoPath, undefined, sha, maxCount, reverse, undefined);
}
catch (ex) {
return undefined;

Laden…
Annuleren
Opslaan