[git] Fixed duplicated entries for git history on merge operations

Signed-off-by: Federico Bozzini <federico.bozzini@gmail.com>
eclipse-theia · Feb 25, 2020 · c46435a · c46435a
1 parent 2ef80c0
commit c46435a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/packages/git/src/browser/git-scm-provider.ts b/packages/git/src/browser/git-scm-provider.ts
@@ -383,7 +383,6 @@ export class GitAmendSupport implements ScmAmendSupport {
             this.repository,
             {
                 range: { toRevision: amendingHeadCommitSha, fromRevision: latestCommitSha },
-                firstParent: true,
                 maxCount: 50
             }
         );

diff --git a/packages/git/src/common/git.ts b/packages/git/src/common/git.ts
@@ -546,11 +546,6 @@ export namespace Git {
              * Decides whether the commit hash should be the abbreviated version.
              */
             readonly shortSha?: boolean;
-
-            /**
-             * Return only commits reached by following the first parent, giving a linear list of commits.
-             */
-            readonly firstParent?: boolean;
         }
 
         /**

diff --git a/packages/git/src/node/dugite-git.ts b/packages/git/src/node/dugite-git.ts
@@ -647,7 +647,7 @@ export class DugiteGit implements Git {
             args.push('--first-parent');
         }
         const range = this.mapRange((options || {}).range);
-        args.push(...[range, '-C', '-M', '-m']);
+        args.push(...[range, '-C', '-M', '-m', '--first-parent']);
         const maxCount = options && options.maxCount ? options.maxCount : 0;
         if (Number.isInteger(maxCount) && maxCount > 0) {
             args.push(...['-n', `${maxCount}`]);