From 4402f36b020555a818434b532acbe034fab498e3 Mon Sep 17 00:00:00 2001
From: Vladimir Vagaytsev <vladimir.vagaitsev@gmail.com>
Date: Mon, 9 May 2022 14:50:37 +0200
Subject: [PATCH] style: rearranged imports

---
 core/src/vcs/git.ts           | 19 +++++++++----------
 core/test/unit/src/vcs/git.ts |  6 +++---
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/core/src/vcs/git.ts b/core/src/vcs/git.ts
index e6f47463bef..5ff9a8430f0 100644
--- a/core/src/vcs/git.ts
+++ b/core/src/vcs/git.ts
@@ -8,29 +8,28 @@
 
 import { performance } from "perf_hooks"
 import FilterStream from "streamfilter"
-import { join, resolve, relative, isAbsolute, posix } from "path"
+import { isAbsolute, join, posix, relative, resolve } from "path"
 import { flatten, isString } from "lodash"
-import { ensureDir, pathExists, createReadStream, Stats, realpath, readlink, lstat, stat } from "fs-extra"
-import { Transform } from "stream"
-import split2 = require("split2")
-import { VcsHandler, RemoteSourceParams, VcsFile, GetFilesParams, VcsInfo } from "./vcs"
+import { createReadStream, ensureDir, lstat, pathExists, readlink, realpath, stat, Stats } from "fs-extra"
+import { PassThrough, Transform } from "stream"
+import { GetFilesParams, RemoteSourceParams, VcsFile, VcsHandler, VcsInfo } from "./vcs"
 import { ConfigurationError, RuntimeError } from "../exceptions"
 import Bluebird from "bluebird"
 import { getStatsType, joinWithPosix, matchPath } from "../util/fs"
 import { deline } from "../util/string"
-import { splitLast, exec } from "../util/util"
+import { exec, splitLast } from "../util/util"
 import { LogEntry } from "../logger/log-entry"
 import parseGitConfig from "parse-git-config"
 import { getDefaultProfiler, Profile, Profiler } from "../util/profiling"
 import { SortedStreamIntersection } from "../util/streams"
+import { mapLimit } from "async"
+import { TreeCache } from "../cache"
+import { STATIC_DIR } from "../constants"
+import split2 = require("split2")
 import execa = require("execa")
 import isGlob = require("is-glob")
 import chalk = require("chalk")
-import { mapLimit } from "async"
-import { PassThrough } from "stream"
 import hasha = require("hasha")
-import { TreeCache } from "../cache"
-import { STATIC_DIR } from "../constants"
 
 const submoduleErrorSuggestion = `Perhaps you need to run ${chalk.underline(`git submodule update --recursive`)}?`
 const hashConcurrencyLimit = 50
diff --git a/core/test/unit/src/vcs/git.ts b/core/test/unit/src/vcs/git.ts
index ae26e1cc7d8..c0dd1f7fa26 100644
--- a/core/test/unit/src/vcs/git.ts
+++ b/core/test/unit/src/vcs/git.ts
@@ -9,11 +9,11 @@
 import execa = require("execa")
 import { expect } from "chai"
 import tmp from "tmp-promise"
-import { createFile, writeFile, realpath, mkdir, remove, symlink, ensureSymlink, lstat } from "fs-extra"
-import { join, resolve, basename, relative } from "path"
+import { createFile, ensureSymlink, lstat, mkdir, realpath, remove, symlink, writeFile } from "fs-extra"
+import { basename, join, relative, resolve } from "path"
 
 import { expectError, makeTestGardenA, TestGarden } from "../../../helpers"
-import { getCommitIdFromRefList, parseGitUrl, GitHandler } from "../../../../src/vcs/git"
+import { getCommitIdFromRefList, GitHandler, parseGitUrl } from "../../../../src/vcs/git"
 import { LogEntry } from "../../../../src/logger/log-entry"
 import { hashRepoUrl } from "../../../../src/util/ext-source-util"
 import { deline } from "../../../../src/util/string"