From 84f1e4a0ee4147614683799d5bc9d82b24d4f844 Mon Sep 17 00:00:00 2001
From: Federico Bozzini <federico.bozzini@gmail.com>
Date: Tue, 25 Feb 2020 11:33:16 +0000
Subject: [PATCH] [git] Fixed duplicated entries for git history on merge
 operations

Signed-off-by: Federico Bozzini <federico.bozzini@gmail.com>
---
 packages/git/src/browser/git-scm-provider.ts | 1 -
 packages/git/src/common/git.ts               | 5 -----
 packages/git/src/node/dugite-git.ts          | 5 +----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/git/src/browser/git-scm-provider.ts b/packages/git/src/browser/git-scm-provider.ts
index db2a573e5f46e..18fffeb49bd94 100644
--- 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
index 6ec2dcdb0f5a4..b769cce68f60c 100644
--- 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
index f1ff64aab230d..286fcd8440fb1 100644
--- a/packages/git/src/node/dugite-git.ts
+++ b/packages/git/src/node/dugite-git.ts
@@ -643,11 +643,8 @@ export class DugiteGit implements Git {
         if (options && options.branch) {
             args.push(options.branch);
         }
-        if (options && options.firstParent) {
-            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}`]);