diff --git a/changelog.md b/changelog.md
index f805052c2..daf62bc2c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * Work with [githubator-plugin](https://github.com/ditrit/githubator-plugin/tree/0.3.0) version 0.3.0.
 * Improve performance on git add.
 * Replace OIDC authentication by Leto-Modelizer-Api, see [this issue](https://github.com/ditrit/leto-modelizer/issues/425).
+* Separating git-related functions into a dedicated composable.
 
 ### Fixed
 
diff --git a/cypress/e2e/RoundTrips/TextEditor.feature b/cypress/e2e/RoundTrips/TextEditor.feature
index f63e41ea2..98ffa0a72 100644
--- a/cypress/e2e/RoundTrips/TextEditor.feature
+++ b/cypress/e2e/RoundTrips/TextEditor.feature
@@ -627,6 +627,7 @@ Feature: Test roundtrip of the application: text editor
 
     When I set on '[data-cy="rename-file-form"] [data-cy="name-input"]' text 'infra-rename'
     And  I click on '[data-cy="rename-file-form"] [data-cy="submit-button"]'
+    And  I wait 2 seconds
     Then I expect 'positive' toast to appear with text 'Folder is renamed.'
     And  I expect '[data-cy="file-explorer"] [data-cy="folder_infra-rename"]' exists
     And  I expect '[data-cy="file-explorer"] [data-cy="folder_infra"]' not exists
diff --git a/src/components/FileExplorer.vue b/src/components/FileExplorer.vue
index dedc09d29..e776d9f12 100644
--- a/src/components/FileExplorer.vue
+++ b/src/components/FileExplorer.vue
@@ -66,7 +66,8 @@ import GitEvent from 'src/composables/events/GitEvent';
 import FileExplorerActionButton from 'src/components/FileExplorerActionButton.vue';
 import FileName from 'src/components/FileName.vue';
 import { getTree, updateFileInformation } from 'src/composables/FileExplorer';
-import { getProjectFiles, getStatus } from 'src/composables/Project';
+import { getProjectFiles } from 'src/composables/Project';
+import { getStatus } from 'src/composables/Git';
 import { FileInformation } from 'leto-modelizer-plugin-core';
 import FileStatus from 'src/models/git/FileStatus';
 import { useRoute } from 'vue-router';
diff --git a/src/components/NavigationBar.vue b/src/components/NavigationBar.vue
index 7bc7e61a7..0e8209176 100644
--- a/src/components/NavigationBar.vue
+++ b/src/components/NavigationBar.vue
@@ -69,10 +69,8 @@ import { useI18n } from 'vue-i18n';
 import ModelizerSettingsMenu from 'components/menu/ModelizerSettingsMenu.vue';
 import FileEvent from 'src/composables/events/FileEvent';
 import { Notify } from 'quasar';
-import {
-  getProjectById,
-  gitGlobalUpload,
-} from 'src/composables/Project';
+import { getProjectById } from 'src/composables/Project';
+import { gitGlobalUpload } from 'src/composables/Git';
 import GitEvent from 'src/composables/events/GitEvent';
 import { useRoute, useRouter } from 'vue-router';
 
diff --git a/src/components/card/GitBranchCard.vue b/src/components/card/GitBranchCard.vue
index 1c47c7974..50b7693ff 100644
--- a/src/components/card/GitBranchCard.vue
+++ b/src/components/card/GitBranchCard.vue
@@ -19,7 +19,7 @@
 
 <script setup>
 // TODO : Rename file
-import { getCurrentBranch } from 'src/composables/Project';
+import { getCurrentBranch } from 'src/composables/Git';
 import { useRoute } from 'vue-router';
 import { onMounted, onUnmounted, ref } from 'vue';
 import GitEvent from 'src/composables/events/GitEvent';
diff --git a/src/components/dialog/GitCommitDialog.vue b/src/components/dialog/GitCommitDialog.vue
index 6555d2022..35d909233 100644
--- a/src/components/dialog/GitCommitDialog.vue
+++ b/src/components/dialog/GitCommitDialog.vue
@@ -73,7 +73,7 @@ import {
   ref,
 } from 'vue';
 import DialogEvent from 'src/composables/events/DialogEvent';
-import { getStatus } from 'src/composables/Project';
+import { getStatus } from 'src/composables/Git';
 import GitCommitForm from 'components/form/GitCommitForm.vue';
 import GitEvent from 'src/composables/events/GitEvent';
 
diff --git a/src/components/dialog/GitLogDialog.vue b/src/components/dialog/GitLogDialog.vue
index a2bf6b5ca..3523354b9 100644
--- a/src/components/dialog/GitLogDialog.vue
+++ b/src/components/dialog/GitLogDialog.vue
@@ -101,7 +101,7 @@
 import { onMounted, onUnmounted, ref } from 'vue';
 import DefaultDialog from 'components/dialog/DefaultDialog.vue';
 import DialogEvent from 'src/composables/events/DialogEvent';
-import { gitLog } from 'src/composables/Project';
+import { gitLog } from 'src/composables/Git';
 
 const props = defineProps({
   projectName: {
diff --git a/src/components/dialog/GitStatusDialog.vue b/src/components/dialog/GitStatusDialog.vue
index d6fab8e83..a2f730c73 100644
--- a/src/components/dialog/GitStatusDialog.vue
+++ b/src/components/dialog/GitStatusDialog.vue
@@ -106,7 +106,7 @@ import {
   ref,
 } from 'vue';
 import DialogEvent from 'src/composables/events/DialogEvent';
-import { getStatus } from 'src/composables/Project';
+import { getStatus } from 'src/composables/Git';
 
 const props = defineProps({
   projectName: {
diff --git a/src/components/editor/MonacoEditor.vue b/src/components/editor/MonacoEditor.vue
index 2bcce879b..23da2d193 100644
--- a/src/components/editor/MonacoEditor.vue
+++ b/src/components/editor/MonacoEditor.vue
@@ -15,8 +15,8 @@ import {
   writeProjectFile,
   readProjectFile,
   exists,
-  getStatus,
 } from 'src/composables/Project';
+import { getStatus } from 'src/composables/Git';
 import {
   onBeforeMount,
   onMounted,
diff --git a/src/components/form/CreateProjectTemplateForm.vue b/src/components/form/CreateProjectTemplateForm.vue
index 394d523b6..c1cdaaadb 100644
--- a/src/components/form/CreateProjectTemplateForm.vue
+++ b/src/components/form/CreateProjectTemplateForm.vue
@@ -114,11 +114,11 @@ import {
   isUnique,
 } from 'src/composables/QuasarFieldRule';
 import {
-  importProject,
   appendProjectFile,
   initProject,
   getProjects,
 } from 'src/composables/Project';
+import { importProject } from 'src/composables/Git';
 import { getTemplateFileByPath } from 'src/composables/TemplateManager';
 import { FileInput } from 'leto-modelizer-plugin-core';
 import PluginsCard from 'src/components/card/PluginsCard.vue';
diff --git a/src/components/form/GitAddRemoteForm.vue b/src/components/form/GitAddRemoteForm.vue
index 6b6f8f8f9..4b925c45e 100644
--- a/src/components/form/GitAddRemoteForm.vue
+++ b/src/components/form/GitAddRemoteForm.vue
@@ -51,8 +51,8 @@ import {
 import {
   getProjectById,
   saveProject,
-  gitAddRemote,
 } from 'src/composables/Project';
+import { gitAddRemote } from 'src/composables/Git';
 import GitEvent from 'src/composables/events/GitEvent';
 
 const emit = defineEmits(['project-git:save']);
diff --git a/src/components/form/GitCommitForm.vue b/src/components/form/GitCommitForm.vue
index db64a465d..20d3dfb39 100644
--- a/src/components/form/GitCommitForm.vue
+++ b/src/components/form/GitCommitForm.vue
@@ -33,7 +33,7 @@
 <script setup>
 import { ref } from 'vue';
 import { notEmpty } from 'src/composables/QuasarFieldRule';
-import { gitCommit } from 'src/composables/Project';
+import { gitCommit } from 'src/composables/Git';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 
diff --git a/src/components/form/GitNewBranchForm.vue b/src/components/form/GitNewBranchForm.vue
index 5b47d968e..37b6c0806 100644
--- a/src/components/form/GitNewBranchForm.vue
+++ b/src/components/form/GitNewBranchForm.vue
@@ -50,7 +50,7 @@ import {
   getBranches,
   createBranchFrom,
   gitCheckout,
-} from 'src/composables/Project';
+} from 'src/composables/Git';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 import GitEvent from 'src/composables/events/GitEvent';
diff --git a/src/components/form/GitPushForm.vue b/src/components/form/GitPushForm.vue
index b5e7359be..aae6810a0 100644
--- a/src/components/form/GitPushForm.vue
+++ b/src/components/form/GitPushForm.vue
@@ -31,7 +31,8 @@
 
 <script setup>
 import { ref } from 'vue';
-import { getProjectById, gitPush } from 'src/composables/Project';
+import { getProjectById } from 'src/composables/Project';
+import { gitPush } from 'src/composables/Git';
 import { Notify } from 'quasar';
 import { useI18n } from 'vue-i18n';
 
diff --git a/src/components/form/GitUpdateForm.vue b/src/components/form/GitUpdateForm.vue
index 69695502a..e4e65825e 100644
--- a/src/components/form/GitUpdateForm.vue
+++ b/src/components/form/GitUpdateForm.vue
@@ -31,7 +31,8 @@
 
 <script setup>
 import { ref } from 'vue';
-import { getProjectById, gitUpdate } from 'src/composables/Project';
+import { getProjectById } from 'src/composables/Project';
+import { gitUpdate } from 'src/composables/Git';
 import { Notify } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import GitEvent from 'src/composables/events/GitEvent';
diff --git a/src/components/form/ImportProjectForm.vue b/src/components/form/ImportProjectForm.vue
index 9465170ae..0e8ffc932 100644
--- a/src/components/form/ImportProjectForm.vue
+++ b/src/components/form/ImportProjectForm.vue
@@ -75,11 +75,11 @@ import {
   isUnique,
 } from 'src/composables/QuasarFieldRule';
 import {
-  importProject,
   getProjects,
   deleteProjectById,
   extractProjectName,
 } from 'src/composables/Project';
+import { importProject } from 'src/composables/Git';
 
 const emit = defineEmits(['project:import']);
 
diff --git a/src/components/form/RenameFileForm.vue b/src/components/form/RenameFileForm.vue
index a1ca844a5..f6b5cd950 100644
--- a/src/components/form/RenameFileForm.vue
+++ b/src/components/form/RenameFileForm.vue
@@ -42,7 +42,8 @@
 import { useI18n } from 'vue-i18n';
 import { onMounted, ref } from 'vue';
 import { notEmpty, isValidFileLabel, isUnique } from 'src/composables/QuasarFieldRule';
-import { gitRemove, readDir, rename } from 'src/composables/Project';
+import { readDir, rename } from 'src/composables/Project';
+import { gitRemove } from 'src/composables/Git';
 import { Notify } from 'quasar';
 import FileEvent from 'src/composables/events/FileEvent';
 
diff --git a/src/components/menu/FileExplorerActionMenu.vue b/src/components/menu/FileExplorerActionMenu.vue
index 4e95816a4..4c55e014b 100644
--- a/src/components/menu/FileExplorerActionMenu.vue
+++ b/src/components/menu/FileExplorerActionMenu.vue
@@ -104,7 +104,7 @@
 
 <script setup>
 import { computed, ref } from 'vue';
-import { getStatus, gitAdd } from 'src/composables/Project';
+import { getStatus, gitAdd } from 'src/composables/Git';
 import { Notify } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import DialogEvent from 'src/composables/events/DialogEvent';
diff --git a/src/components/menu/GitBranchActionMenu.vue b/src/components/menu/GitBranchActionMenu.vue
index 37485071e..531d4a1f7 100644
--- a/src/components/menu/GitBranchActionMenu.vue
+++ b/src/components/menu/GitBranchActionMenu.vue
@@ -59,7 +59,7 @@
 
 <script setup>
 import { ref } from 'vue';
-import { gitCheckout } from 'src/composables/Project';
+import { gitCheckout } from 'src/composables/Git';
 import { useRoute } from 'vue-router';
 import DialogEvent from 'src/composables/events/DialogEvent';
 import GitEvent from 'src/composables/events/GitEvent';
diff --git a/src/components/menu/GitBranchMenu.vue b/src/components/menu/GitBranchMenu.vue
index 9310bb631..38c795c7d 100644
--- a/src/components/menu/GitBranchMenu.vue
+++ b/src/components/menu/GitBranchMenu.vue
@@ -152,11 +152,11 @@ import {
   ref,
 } from 'vue';
 import { useRoute } from 'vue-router';
+import { getProjectById } from 'src/composables/Project';
 import {
   getBranches,
   gitFetch,
-  getProjectById,
-} from 'src/composables/Project';
+} from 'src/composables/Git';
 import GitBranchExpandListMenu from 'components/menu/GitBranchExpandListMenu.vue';
 import DialogEvent from 'src/composables/events/DialogEvent';
 import { searchText } from 'src/composables/Filter';
diff --git a/src/components/tab/FileTabs.vue b/src/components/tab/FileTabs.vue
index 2422493c4..150e7e43d 100644
--- a/src/components/tab/FileTabs.vue
+++ b/src/components/tab/FileTabs.vue
@@ -43,7 +43,8 @@ import {
 import FileTabHeader from 'src/components/tab/FileTabHeader.vue';
 import FileEvent from 'src/composables/events/FileEvent';
 import GitEvent from 'src/composables/events/GitEvent';
-import { exists, getStatus } from 'src/composables/Project';
+import { exists } from 'src/composables/Project';
+import { getStatus } from 'src/composables/Git';
 
 const props = defineProps({
   projectName: {
diff --git a/src/composables/Git.js b/src/composables/Git.js
new file mode 100644
index 000000000..3c0894214
--- /dev/null
+++ b/src/composables/Git.js
@@ -0,0 +1,382 @@
+import git from 'isomorphic-git';
+import http from 'isomorphic-git/http/web';
+import * as BrowserFS from 'browserfs';
+import Branch from 'src/models/git/Branch';
+import FileStatus from 'src/models/git/FileStatus';
+import { saveProject } from 'src/composables/Project';
+
+const fs = BrowserFS.BFSRequire('fs');
+
+/**
+ * Initialize a new repository.
+ * @param {string} projectId - Id of project.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function gitInit(projectId) {
+  return git.init({ fs, dir: `/${projectId}` });
+}
+
+/**
+ * Clone and save project from git in local storage.
+ * @param {Project} project - Project to save.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function importProject(project) {
+  return git.clone({
+    fs,
+    http,
+    url: project.git.repository,
+    dir: `/${project.id}`,
+    onAuth: () => ({
+      username: project.git.username,
+      password: project.git.token,
+    }),
+    corsProxy: '/cors-proxy',
+    singleBranch: true,
+    depth: 1,
+  }).then(() => saveProject(project));
+}
+
+/**
+ * Fetch project on git.
+ * Warning: It seems that `git.fetch` can throw unexpected error.
+ * @param {Project} project - Project to update.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function gitFetch(project) {
+  if (project.git?.repository) {
+    return git.fetch({
+      fs,
+      http,
+      url: project.git.repository,
+      dir: `/${project.id}`,
+      onAuth: () => ({
+        username: project.git.username,
+        password: project.git.token,
+      }),
+      corsProxy: '/cors-proxy',
+    });
+  }
+  return Promise.resolve();
+}
+
+/**
+ * Get current branch of git project.
+ * @param {string} projectId - Id of project.
+ * @returns {Promise<string>} Promise with current branch name on success otherwise error.
+ */
+export async function getCurrentBranch(projectId) {
+  return git.currentBranch({
+    fs,
+    dir: `/${projectId}`,
+    fullname: false,
+  });
+}
+
+/**
+ * Get all branches of project.
+ * @param {string} projectId - Id of project.
+ * @returns {Promise<Branch[]>} Promise with array of branches on success otherwise error.
+ */
+export async function getBranches(projectId) {
+  const dir = `/${projectId}`;
+
+  const [local, remote] = await Promise.all([
+    git.listBranches({
+      fs,
+      dir,
+    }),
+    git.listBranches({
+      fs,
+      dir,
+      remote: 'origin',
+    }),
+  ]);
+
+  const branches = local.map((localBranch) => (new Branch({
+    name: localBranch,
+    onLocal: true,
+    onRemote: remote.includes(localBranch),
+    remote: 'origin',
+  })));
+
+  // TODO: remove this when https://github.com/isomorphic-git/isomorphic-git/issues/1650 is resolve.
+  if (branches.length === 0) {
+    const currentBranch = await getCurrentBranch(projectId);
+    branches.push(new Branch({
+      name: currentBranch,
+      onLocal: true,
+      onRemote: false,
+      remote: 'origin',
+    }));
+  }
+
+  return branches.concat(
+    remote
+      .filter((remoteBranch) => !local.includes(remoteBranch))
+      .map((remoteBranch) => (new Branch({
+        name: remoteBranch,
+        onLocal: false,
+        onRemote: true,
+        remote: 'origin',
+      }))),
+  ).filter(({ name }) => name !== 'HEAD');
+}
+
+/**
+ * Get list of all the files in the current staging area.
+ * @param {string} projectId - Id of the project.
+ * @returns {Promise<string[]>} Promise with array of filepaths on success otherwise an error.
+ */
+export async function gitListFiles(projectId) {
+  return git.listFiles({
+    fs,
+    dir: `/${projectId}`,
+  });
+}
+
+/**
+ * Update remote origin, fetch and checkout the default branch.
+ * @param {Project} project - Project to update.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function gitAddRemote(project) {
+  await git.addRemote({
+    fs,
+    dir: `/${project.id}`,
+    url: project.git.repository,
+    remote: 'origin',
+    force: true,
+  });
+}
+
+/**
+ * Checkout branch.
+ * @param {string} projectId - Id of project.
+ * @param {string} branch - Branch name to checkout.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function gitCheckout(projectId, branch) {
+  await git.checkout({
+    fs,
+    dir: `/${projectId}`,
+    ref: branch,
+  }).catch(({ name }) => Promise.reject({ name }));
+}
+
+/**
+ * Create branch from another branch.
+ * @param {string} projectId - Id of project.
+ * @param {string} newBranchName - New branch name.
+ * @param {string} branchName - Branch name.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function createBranchFrom(projectId, newBranchName, branchName) {
+  await git.branch({
+    fs,
+    dir: `/${projectId}`,
+    ref: newBranchName,
+    object: branchName,
+  }).catch(({ name, message }) => {
+    if (message.indexOf('ENOTDIR: File is not a directory.') >= 0) {
+      return Promise.reject({ name: 'cannotLockRef', message });
+    }
+    return Promise.reject({ name, message });
+  });
+}
+
+/**
+ * Add untracked, unstaged or modified files.
+ * @param {string} projectId - Id of project.
+ * @param {string} filepath - Path of the file to add.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function gitAdd(projectId, filepath) {
+  return git.add({
+    fs,
+    dir: `/${projectId}`,
+    filepath,
+  });
+}
+
+/**
+ * Add (stage) deleted files.
+ * @param {string} projectId - Id of project.
+ * @param {string} filepath - Path of the file to add.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function gitRemove(projectId, filepath) {
+  return git.remove({
+    fs,
+    dir: `/${projectId}`,
+    filepath,
+  });
+}
+
+/**
+ * Update selected branch with git pull.
+ * @param {Project} project - Project to update.
+ * @param {string} branchName - Branch name.
+ * @param {boolean} fastForward - State of fast forward option.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function gitUpdate(project, branchName, fastForward) {
+  await git.pull({
+    fs,
+    http,
+    dir: `/${project.id}`,
+    ref: branchName,
+    fastForward,
+    singleBranch: true,
+    onAuth: () => ({
+      username: project.git.username,
+      password: project.git.token,
+    }),
+    // TODO: Change when we have user information.
+    author: {
+      name: 'LetoModelizer',
+      email: 'LetoModelizer@no-reply.com',
+    },
+    corsProxy: '/cors-proxy',
+  });
+}
+
+/**
+ * Get the status of all files. If filePaths is defined, get the status of the files
+ * that strictly or partially match the given filePaths.
+ * @param {string} projectId - Id of project.
+ * @param {string[]} filepaths - Limit the query to the given files and directories.
+ * @param {Function} filter - Filter to only return results whose filepath matches a given function.
+ * @returns {Promise<FileStatus[]>} All files status.
+ */
+export async function getStatus(projectId, filepaths, filter) {
+  return git.statusMatrix({
+    fs,
+    dir: `/${projectId}`,
+    filepaths,
+    filter,
+  }).then((files) => files
+    .map((file) => new FileStatus({
+      path: file[0],
+      headStatus: file[1],
+      workdirStatus: file[2],
+      stageStatus: file[3],
+    })));
+}
+
+/**
+ * Push selected branch on server.
+ * @param {Project} project - Project.
+ * @param {string} branchName - Branch name.
+ * @param {boolean} force - State of force option.
+ * @returns {Promise<void>} Promise with nothing on success otherwise an error.
+ */
+export async function gitPush(project, branchName, force) {
+  await git.push({
+    fs,
+    http,
+    dir: `/${project.id}`,
+    remote: 'origin',
+    ref: branchName,
+    force,
+    onAuth: () => ({
+      username: project.git.username,
+      password: project.git.token,
+    }),
+    corsProxy: '/cors-proxy',
+  });
+}
+
+/**
+ * Commit all staged files.
+ * @param {string} projectId - Id of project.
+ * @param {string} message - Commit message.
+ * @param {boolean} noUpdateBranchValue - If true, does not update the branch pointer
+ * after creating the commit.
+ * @returns {Promise<void>} Promise with the SHA-1 object id of the newly created commit on success
+ * otherwise an error.
+ */
+export async function gitCommit(projectId, message, noUpdateBranchValue = false) {
+  return git.commit({
+    fs,
+    dir: `/${projectId}`,
+    noUpdateBranch: noUpdateBranchValue,
+    // TODO: Change when we have user information.
+    author: {
+      name: 'LetoModelizer',
+      email: 'LetoModelizer@no-reply.com',
+    },
+    message,
+  });
+}
+
+/**
+ * Add and commit all modifications on the new branch and push it.
+ * @param {object} project - Object containing all information about the project.
+ */
+export async function gitGlobalUpload(project) {
+  const nowDate = new Date();
+  const newBranch = `leto-modelizer_${nowDate.getTime()}`;
+  const files = (await getStatus(project.id));
+  const modifiedFiles = files
+    .filter((file) => file.hasUnstagedChanged
+      || file.isUntracked
+      || file.isUnstaged
+      || file.isStaged)
+    .map((file) => file.path);
+
+  await gitAdd(project.id, modifiedFiles);
+
+  /* Special case for deleted files.
+  Unlike usual git, we CAN NOT add (git add) a deleted file,
+  so here, the idea is to use the remove method of isomorphic-git to stage the
+  deleted files.
+  cf: https://github.com/isomorphic-git/isomorphic-git/issues/1099
+  */
+  const deletedfiles = files.filter((file) => file.isDeleted).map((file) => file.path);
+
+  await gitRemove(project.id, deletedfiles);
+
+  /*
+  Commiting BEFORE creating a new branch.
+  Again, due to some specific behavior in isomorphic-git, the modifications are not
+  transfered (unlike usual git) while creating a new branch or doing a checkout.
+
+  Creating the (orphan) commit before, give the possibility to create a new branch from that commit.
+  Which will contains all modifications AND will be attached to the newly created branch.
+  */
+  const sha1 = await gitCommit(
+    project.id,
+    `leto-modelizer ${nowDate.toDateString()}`,
+    true,
+  );
+
+  await createBranchFrom(
+    project.id,
+    newBranch,
+    sha1,
+  );
+  await gitCheckout(project.id, newBranch);
+  await gitPush(
+    project,
+    newBranch,
+    true,
+  );
+}
+
+/**
+ * Get all logs from git log.
+ * @param {string} projectId - Id of project.
+ * @param {string} ref - The commit to begin walking backwards through the history from.
+ * @param {number} [depth] - Number of log to retrieve.
+ * @returns {Promise<ReadCommitResult[]>} Promise with logs on success otherwise an error.
+ * @see https://isomorphic-git.org/docs/en/log
+ */
+export async function gitLog(projectId, ref, depth = 25) {
+  return git.log({
+    fs,
+    dir: `/${projectId}`,
+    depth,
+    ref,
+  });
+}
diff --git a/src/composables/Project.js b/src/composables/Project.js
index 67183af42..491368c69 100644
--- a/src/composables/Project.js
+++ b/src/composables/Project.js
@@ -1,18 +1,21 @@
-import git from 'isomorphic-git';
-import http from 'isomorphic-git/http/web';
 import * as BrowserFS from 'browserfs';
 import {
   FileInformation,
   FileInput,
 } from 'leto-modelizer-plugin-core';
-import Branch from 'src/models/git/Branch';
-import FileStatus from 'src/models/git/FileStatus';
 import {
   getFileInputs,
   getPlugins,
   getPluginByName,
 } from 'src/composables/PluginManager';
 import Project from 'src/models/Project';
+import {
+  gitListFiles,
+  gitRemove,
+  gitInit,
+  gitAdd,
+  gitCommit,
+} from 'src/composables/Git';
 
 const fs = BrowserFS.BFSRequire('fs');
 
@@ -110,50 +113,6 @@ export function saveProject(project) {
   localStorage.setItem(PROJECT_STORAGE_KEY, JSON.stringify(projects));
 }
 
-/**
- * Clone and save project from git in local storage.
- * @param {Project} project - Project to save.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function importProject(project) {
-  return git.clone({
-    fs,
-    http,
-    url: project.git.repository,
-    dir: `/${project.id}`,
-    onAuth: () => ({
-      username: project.git.username,
-      password: project.git.token,
-    }),
-    corsProxy: '/cors-proxy',
-    singleBranch: true,
-    depth: 1,
-  }).then(() => saveProject(project));
-}
-
-/**
- * Fetch project on git.
- * Warning: It seems that `git.fetch` can throw unexpected error.
- * @param {Project} project - Project to update.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function gitFetch(project) {
-  if (project.git?.repository) {
-    return git.fetch({
-      fs,
-      http,
-      url: project.git.repository,
-      dir: `/${project.id}`,
-      onAuth: () => ({
-        username: project.git.username,
-        password: project.git.token,
-      }),
-      corsProxy: '/cors-proxy',
-    });
-  }
-  return Promise.resolve();
-}
-
 /**
  * Check if path is directory or not.
  * @param {string} path - Path to check.
@@ -263,19 +222,6 @@ export async function getProjectFolders(projectId) {
   return files;
 }
 
-/**
- * Get current branch of git project.
- * @param {string} projectId - Id of project.
- * @returns {Promise<string>} Promise with current branch name on success otherwise error.
- */
-export async function getCurrentBranch(projectId) {
-  return git.currentBranch({
-    fs,
-    dir: `/${projectId}`,
-    fullname: false,
-  });
-}
-
 /**
  * Get file content.
  * @param {string} projectId - Id of project.
@@ -294,56 +240,6 @@ export async function readProjectFile(projectId, fileInformation) {
   return new FileInput({ path: fileInformation.path, content });
 }
 
-/**
- * Get all branches of project.
- * @param {string} projectId - Id of project.
- * @returns {Promise<Branch[]>} Promise with array of branches on success otherwise error.
- */
-export async function getBranches(projectId) {
-  const dir = `/${projectId}`;
-
-  const [local, remote] = await Promise.all([
-    git.listBranches({
-      fs,
-      dir,
-    }),
-    git.listBranches({
-      fs,
-      dir,
-      remote: 'origin',
-    }),
-  ]);
-
-  const branches = local.map((localBranch) => (new Branch({
-    name: localBranch,
-    onLocal: true,
-    onRemote: remote.includes(localBranch),
-    remote: 'origin',
-  })));
-
-  // TODO: remove this when https://github.com/isomorphic-git/isomorphic-git/issues/1650 is resolve.
-  if (branches.length === 0) {
-    const currentBranch = await getCurrentBranch(projectId);
-    branches.push(new Branch({
-      name: currentBranch,
-      onLocal: true,
-      onRemote: false,
-      remote: 'origin',
-    }));
-  }
-
-  return branches.concat(
-    remote
-      .filter((remoteBranch) => !local.includes(remoteBranch))
-      .map((remoteBranch) => (new Branch({
-        name: remoteBranch,
-        onLocal: false,
-        onRemote: true,
-        remote: 'origin',
-      }))),
-  ).filter(({ name }) => name !== 'HEAD');
-}
-
 /**
  * Create a new directory.
  * @param {string} path - Path of the folder to create.
@@ -441,124 +337,6 @@ export async function appendProjectFile(projectId, file) {
   });
 }
 
-/**
- * Get list of all the files in the current staging area.
- * @param {string} projectId - Id of the project.
- * @returns {Promise<string[]>} Promise with array of filepaths on success otherwise an error.
- */
-export async function gitListFiles(projectId) {
-  return git.listFiles({
-    fs,
-    dir: `/${projectId}`,
-  });
-}
-
-/**
- * Update remote origin, fetch and checkout the default branch.
- * @param {Project} project - Project to update.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function gitAddRemote(project) {
-  await git.addRemote({
-    fs,
-    dir: `/${project.id}`,
-    url: project.git.repository,
-    remote: 'origin',
-    force: true,
-  });
-}
-
-/**
- * Checkout branch.
- * @param {string} projectId - Id of project.
- * @param {string} branch - Branch name to checkout.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function gitCheckout(projectId, branch) {
-  await git.checkout({
-    fs,
-    dir: `/${projectId}`,
-    ref: branch,
-  }).catch(({ name }) => Promise.reject({ name }));
-}
-
-/**
- * Create branch from another branch.
- * @param {string} projectId - Id of project.
- * @param {string} newBranchName - New branch name.
- * @param {string} branchName - Branch name.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function createBranchFrom(projectId, newBranchName, branchName) {
-  await git.branch({
-    fs,
-    dir: `/${projectId}`,
-    ref: newBranchName,
-    object: branchName,
-  }).catch(({ name, message }) => {
-    if (message.indexOf('ENOTDIR: File is not a directory.') >= 0) {
-      return Promise.reject({ name: 'cannotLockRef', message });
-    }
-    return Promise.reject({ name, message });
-  });
-}
-
-/**
- * Add untracked, unstaged or modified files.
- * @param {string} projectId - Id of project.
- * @param {string} filepath - Path of the file to add.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function gitAdd(projectId, filepath) {
-  return git.add({
-    fs,
-    dir: `/${projectId}`,
-    filepath,
-  });
-}
-
-/**
- * Add (stage) deleted files.
- * @param {string} projectId - Id of project.
- * @param {string} filepath - Path of the file to add.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function gitRemove(projectId, filepath) {
-  return git.remove({
-    fs,
-    dir: `/${projectId}`,
-    filepath,
-  });
-}
-
-/**
- * Update selected branch with git pull.
- * @param {Project} project - Project to update.
- * @param {string} branchName - Branch name.
- * @param {boolean} fastForward - State of fast forward option.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function gitUpdate(project, branchName, fastForward) {
-  await git.pull({
-    fs,
-    http,
-    dir: `/${project.id}`,
-    ref: branchName,
-    fastForward,
-    singleBranch: true,
-    onAuth: () => ({
-      username: project.git.username,
-      password: project.git.token,
-    }),
-    // TODO: Change when we have user information.
-    author: {
-      name: 'LetoModelizer',
-      email: 'LetoModelizer@no-reply.com',
-    },
-    corsProxy: '/cors-proxy',
-  });
-}
-
 /**
  * Delete folder on fs.
  * @param {string} path - Path of folder to delete.
@@ -701,146 +479,6 @@ export async function deleteDiagramFile(pluginName, projectId, filePath) {
   }));
 }
 
-/**
- * Get the status of all files. If filePaths is defined, get the status of the files
- * that strictly or partially match the given filePaths.
- * @param {string} projectId - Id of project.
- * @param {string[]} filepaths - Limit the query to the given files and directories.
- * @param {Function} filter - Filter to only return results whose filepath matches a given function.
- * @returns {Promise<FileStatus[]>} All files status.
- */
-export async function getStatus(projectId, filepaths, filter) {
-  return git.statusMatrix({
-    fs,
-    dir: `/${projectId}`,
-    filepaths,
-    filter,
-  }).then((files) => files
-    .map((file) => new FileStatus({
-      path: file[0],
-      headStatus: file[1],
-      workdirStatus: file[2],
-      stageStatus: file[3],
-    })));
-}
-
-/**
- * Push selected branch on server.
- * @param {Project} project - Project.
- * @param {string} branchName - Branch name.
- * @param {boolean} force - State of force option.
- * @returns {Promise<void>} Promise with nothing on success otherwise an error.
- */
-export async function gitPush(project, branchName, force) {
-  await git.push({
-    fs,
-    http,
-    dir: `/${project.id}`,
-    remote: 'origin',
-    ref: branchName,
-    force,
-    onAuth: () => ({
-      username: project.git.username,
-      password: project.git.token,
-    }),
-    corsProxy: '/cors-proxy',
-  });
-}
-
-/**
- * Commit all staged files.
- * @param {string} projectId - Id of project.
- * @param {string} message - Commit message.
- * @param {boolean} noUpdateBranchValue - If true, does not update the branch pointer
- * after creating the commit.
- * @returns {Promise<void>} Promise with the SHA-1 object id of the newly created commit on success
- * otherwise an error.
- */
-export async function gitCommit(projectId, message, noUpdateBranchValue = false) {
-  return git.commit({
-    fs,
-    dir: `/${projectId}`,
-    noUpdateBranch: noUpdateBranchValue,
-    // TODO: Change when we have user information.
-    author: {
-      name: 'LetoModelizer',
-      email: 'LetoModelizer@no-reply.com',
-    },
-    message,
-  });
-}
-
-/**
- * Add and commit all modifications on the new branch and push it.
- * @param {object} project - Object containing all information about the project.
- */
-export async function gitGlobalUpload(project) {
-  const nowDate = new Date();
-  const newBranch = `leto-modelizer_${nowDate.getTime()}`;
-  const files = (await getStatus(project.id));
-  const modifiedFiles = files
-    .filter((file) => file.hasUnstagedChanged
-      || file.isUntracked
-      || file.isUnstaged
-      || file.isStaged)
-    .map((file) => file.path);
-
-  await gitAdd(project.id, modifiedFiles);
-
-  /* Special case for deleted files.
-  Unlike usual git, we CAN NOT add (git add) a deleted file,
-  so here, the idea is to use the remove method of isomorphic-git to stage the
-  deleted files.
-  cf: https://github.com/isomorphic-git/isomorphic-git/issues/1099
-  */
-  const deletedfiles = files.filter((file) => file.isDeleted).map((file) => file.path);
-
-  await gitRemove(project.id, deletedfiles);
-
-  /*
-  Commiting BEFORE creating a new branch.
-  Again, due to some specific behavior in isomorphic-git, the modifications are not
-  transfered (unlike usual git) while creating a new branch or doing a checkout.
-
-  Creating the (orphan) commit before, give the possibility to create a new branch from that commit.
-  Which will contains all modifications AND will be attached to the newly created branch.
-  */
-  const sha1 = await gitCommit(
-    project.id,
-    `leto-modelizer ${nowDate.toDateString()}`,
-    true,
-  );
-
-  await createBranchFrom(
-    project.id,
-    newBranch,
-    sha1,
-  );
-  await gitCheckout(project.id, newBranch);
-  await gitPush(
-    project,
-    newBranch,
-    true,
-  );
-}
-
-/**
- * Get all logs from git log.
- * @param {string} projectId - Id of project.
- * @param {string} ref - The commit to begin walking backwards through the history from.
- * @param {number} [depth] - Number of log to retrieve.
- * @returns {Promise<ReadCommitResult[]>} Promise with logs on success otherwise an error.
- * @see https://isomorphic-git.org/docs/en/log
- */
-export async function gitLog(projectId, ref, depth = 25) {
-  return git.log({
-    fs,
-    dir: `/${projectId}`,
-    depth,
-    ref,
-  });
-}
-
 /**
  * Save project and initialize git in local storage.
  * @param {Project} project - Project to save.
@@ -848,7 +486,7 @@ export async function gitLog(projectId, ref, depth = 25) {
  */
 export async function initProject(project) {
   saveProject(project);
-  await git.init({ fs, dir: `/${project.id}` });
+  await gitInit(project.id);
   await writeProjectFile(project.id, new FileInput({
     path: 'README.md',
     content: `# ${project.id}\n`,
diff --git a/tests/unit/components/FileExplorer.spec.js b/tests/unit/components/FileExplorer.spec.js
index c7b74095a..2bf90a319 100644
--- a/tests/unit/components/FileExplorer.spec.js
+++ b/tests/unit/components/FileExplorer.spec.js
@@ -5,17 +5,20 @@ import i18nConfiguration from 'src/i18n';
 import FileExplorer from 'src/components/FileExplorer.vue';
 import FileEvent from 'src/composables/events/FileEvent';
 import GitEvent from 'src/composables/events/GitEvent';
-import * as Project from 'src/composables/Project';
+import * as Git from 'src/composables/Git';
 import * as PluginManager from 'src/composables/PluginManager';
 
 installQuasarPlugin();
 
 jest.mock('src/composables/Project', () => ({
   getProjectFiles: jest.fn(() => Promise.resolve([])),
-  getStatus: jest.fn(() => Promise.resolve([])),
   isDirectory: jest.fn((file) => Promise.resolve(file === 'folder')),
 }));
 
+jest.mock('src/composables/Git', () => ({
+  getStatus: jest.fn(() => Promise.resolve([])),
+}));
+
 jest.mock('vue-router', () => ({
   useRoute: jest.fn(() => ({
     query: { path: 'pluginName/modelName' },
@@ -424,7 +427,7 @@ describe('Test component: FileExplorer', () => {
         setExpanded: jest.fn(),
       };
       wrapper.vm.localFileInformations = [];
-      Project.getStatus.mockImplementation(() => [{ path: 'fileName' }]);
+      Git.getStatus.mockImplementation(() => [{ path: 'fileName' }]);
 
       await wrapper.vm.onCreateFile(file);
 
diff --git a/tests/unit/components/NavigationBar.spec.js b/tests/unit/components/NavigationBar.spec.js
index 83abd5c44..41f9acb21 100644
--- a/tests/unit/components/NavigationBar.spec.js
+++ b/tests/unit/components/NavigationBar.spec.js
@@ -4,7 +4,7 @@ import NavigationBar from 'src/components/NavigationBar.vue';
 import FileEvent from 'src/composables/events/FileEvent';
 import GitEvent from 'src/composables/events/GitEvent';
 import { Notify } from 'quasar';
-import Project from 'src/composables/Project';
+import * as Git from 'src/composables/Git';
 import { useRouter } from 'vue-router';
 
 installQuasarPlugin({
@@ -40,7 +40,6 @@ jest.mock('src/composables/events/GitEvent', () => ({
 }));
 
 jest.mock('src/composables/Project', () => ({
-  gitGlobalUpload: jest.fn(),
   getProjectById: jest.fn((projectName) => {
     if (projectName === 'projectTest') {
       return { git: { repository: {}, username: 'username', token: 'token' } };
@@ -49,6 +48,10 @@ jest.mock('src/composables/Project', () => ({
   }),
 }));
 
+jest.mock('src/composables/Git', () => ({
+  gitGlobalUpload: jest.fn(),
+}));
+
 describe('Test component: NavigationBar', () => {
   let wrapper;
   let addRemoteSubscribe;
@@ -60,7 +63,7 @@ describe('Test component: NavigationBar', () => {
   const globalUploadFilesEvent = jest.fn();
 
   FileEvent.GlobalUploadFilesEvent.next.mockImplementation(globalUploadFilesEvent);
-  Project.gitGlobalUpload.mockImplementation(
+  Git.gitGlobalUpload.mockImplementation(
     (project) => (project.git ? Promise.resolve() : Promise.reject()),
   );
 
diff --git a/tests/unit/components/card/GitBranchCard.spec.js b/tests/unit/components/card/GitBranchCard.spec.js
index 654093f53..b8a221f86 100644
--- a/tests/unit/components/card/GitBranchCard.spec.js
+++ b/tests/unit/components/card/GitBranchCard.spec.js
@@ -4,7 +4,7 @@ import GitBranchCard from 'src/components/card/GitBranchCard.vue';
 import { useRoute } from 'vue-router';
 import GitEvent from 'src/composables/events/GitEvent';
 import FileEvent from 'src/composables/events/FileEvent';
-import Project from 'src/composables/Project';
+import * as Git from 'src/composables/Git';
 
 installQuasarPlugin();
 
@@ -12,7 +12,7 @@ jest.mock('vue-router', () => ({
   useRoute: jest.fn(),
 }));
 
-jest.mock('src/composables/Project', () => ({
+jest.mock('src/composables/Git', () => ({
   getCurrentBranch: jest.fn(() => Promise.resolve('main')),
 }));
 
@@ -87,7 +87,7 @@ describe('Test component: GitBranchCard', () => {
       wrapper.vm.loading = true;
       expect(wrapper.vm.currentBranch).toEqual('main');
 
-      Project.getCurrentBranch.mockReturnValueOnce(Promise.resolve('test'));
+      Git.getCurrentBranch.mockReturnValueOnce(Promise.resolve('test'));
 
       await wrapper.vm.updateBranch();
       await flushPromises();
diff --git a/tests/unit/components/dialog/GitCommitDialog.spec.js b/tests/unit/components/dialog/GitCommitDialog.spec.js
index 123b23a1e..427518c47 100644
--- a/tests/unit/components/dialog/GitCommitDialog.spec.js
+++ b/tests/unit/components/dialog/GitCommitDialog.spec.js
@@ -15,7 +15,7 @@ jest.mock('src/composables/events/DialogEvent', () => ({
   subscribe: jest.fn(),
 }));
 
-jest.mock('src/composables/Project', () => ({
+jest.mock('src/composables/Git', () => ({
   getStatus: jest.fn(() => Promise.resolve([
     mockStagedFileStatus,
     mockNotStagedFileStatus,
diff --git a/tests/unit/components/dialog/GitLogDialog.spec.js b/tests/unit/components/dialog/GitLogDialog.spec.js
index 21fb36e5c..7a617facf 100644
--- a/tests/unit/components/dialog/GitLogDialog.spec.js
+++ b/tests/unit/components/dialog/GitLogDialog.spec.js
@@ -4,7 +4,7 @@ import { createI18n } from 'vue-i18n';
 import i18nConfiguration from 'src/i18n';
 import GitLogDialog from 'src/components/dialog/GitLogDialog.vue';
 import DialogEvent from 'src/composables/events/DialogEvent';
-import { gitLog } from 'src/composables/Project';
+import { gitLog } from 'src/composables/Git';
 
 installQuasarPlugin();
 
@@ -12,7 +12,7 @@ jest.mock('src/composables/events/DialogEvent', () => ({
   subscribe: jest.fn(),
 }));
 
-jest.mock('src/composables/Project', () => ({
+jest.mock('src/composables/Git', () => ({
   gitLog: jest.fn((projectId, commitRef, depth) => {
     const logs = [];
     if (depth === 26) {
diff --git a/tests/unit/components/dialog/GitStatusDialog.spec.js b/tests/unit/components/dialog/GitStatusDialog.spec.js
index a5ee0b863..cee099e25 100644
--- a/tests/unit/components/dialog/GitStatusDialog.spec.js
+++ b/tests/unit/components/dialog/GitStatusDialog.spec.js
@@ -13,7 +13,7 @@ jest.mock('src/composables/events/DialogEvent', () => ({
   subscribe: jest.fn(),
 }));
 
-jest.mock('src/composables/Project', () => ({
+jest.mock('src/composables/Git', () => ({
   getStatus: jest.fn(() => Promise.resolve([mockFileStatus])),
 }));
 
diff --git a/tests/unit/components/editor/MonacoEditor.spec.js b/tests/unit/components/editor/MonacoEditor.spec.js
index b03f5c604..b9b6c6705 100644
--- a/tests/unit/components/editor/MonacoEditor.spec.js
+++ b/tests/unit/components/editor/MonacoEditor.spec.js
@@ -24,6 +24,9 @@ jest.mock('src/composables/Project', () => ({
   writeProjectFile: jest.fn(),
   readProjectFile: jest.fn(() => Promise.resolve('fileContent')),
   exists: jest.fn((fileId) => Promise.resolve(fileId === 'project-00000000/file.js')),
+}));
+
+jest.mock('src/composables/Git', () => ({
   getStatus: jest.fn(() => Promise.resolve([{ path: 'file.js' }])),
 }));
 
diff --git a/tests/unit/components/form/CreateProjectTemplateForm.spec.js b/tests/unit/components/form/CreateProjectTemplateForm.spec.js
index 8f703ea28..ec6b87717 100644
--- a/tests/unit/components/form/CreateProjectTemplateForm.spec.js
+++ b/tests/unit/components/form/CreateProjectTemplateForm.spec.js
@@ -2,7 +2,8 @@ import { installQuasarPlugin } from '@quasar/quasar-app-extension-testing-unit-j
 import { shallowMount } from '@vue/test-utils';
 import CreateProjectTemplateForm from 'src/components/form/CreateProjectTemplateForm.vue';
 import { Notify } from 'quasar';
-import Project from 'src/composables/Project';
+import * as Project from 'src/composables/Project';
+import * as Git from 'src/composables/Git';
 
 installQuasarPlugin({
   plugins: [Notify],
@@ -15,12 +16,15 @@ jest.mock('vue-i18n', () => ({
 }));
 
 jest.mock('src/composables/Project', () => ({
-  importProject: jest.fn(() => Promise.resolve()),
   initProject: jest.fn(() => Promise.resolve()),
   appendProjectFile: jest.fn(() => Promise.resolve()),
   getProjects: jest.fn(() => ['project']),
 }));
 
+jest.mock('src/composables/Git', () => ({
+  importProject: jest.fn(() => Promise.resolve()),
+}));
+
 jest.mock('src/composables/Random', () => ({
   randomHexString: () => '00000000',
 }));
@@ -83,7 +87,7 @@ describe('Test component: CreateProjectTemplateForm', () => {
 
       await wrapper.vm.onSubmit();
 
-      expect(Project.importProject).toBeCalled();
+      expect(Git.importProject).toBeCalled();
     });
 
     it('should emit an event and a positive notification on success', async () => {
diff --git a/tests/unit/components/form/GitAddRemoteForm.spec.js b/tests/unit/components/form/GitAddRemoteForm.spec.js
index 6bf9ee171..7a615878f 100644
--- a/tests/unit/components/form/GitAddRemoteForm.spec.js
+++ b/tests/unit/components/form/GitAddRemoteForm.spec.js
@@ -4,8 +4,8 @@ import GitAddRemoteForm from 'src/components/form/GitAddRemoteForm.vue';
 import {
   getProjectById,
   saveProject,
-  gitAddRemote,
 } from 'src/composables/Project';
+import { gitAddRemote } from 'src/composables/Git';
 import { Notify } from 'quasar';
 import GitEvent from 'src/composables/events/GitEvent';
 
@@ -41,6 +41,9 @@ jest.mock('src/composables/Project', () => ({
     };
   }),
   saveProject: jest.fn(),
+}));
+
+jest.mock('src/composables/Git', () => ({
   gitAddRemote: jest.fn((project) => {
     if (project.id === 'error') {
       return Promise.reject({ name: 'HttpError' });
diff --git a/tests/unit/components/form/GitCommitForm.spec.js b/tests/unit/components/form/GitCommitForm.spec.js
index 69873d0e5..55e08f3d9 100644
--- a/tests/unit/components/form/GitCommitForm.spec.js
+++ b/tests/unit/components/form/GitCommitForm.spec.js
@@ -13,7 +13,7 @@ jest.mock('vue-i18n', () => ({
   }),
 }));
 
-jest.mock('src/composables/Project', () => ({
+jest.mock('src/composables/Git', () => ({
   gitCommit: jest.fn((projectId) => {
     if (projectId === 'error') {
       return Promise.reject({ name: 'error' });
diff --git a/tests/unit/components/form/GitNewBranchForm.spec.js b/tests/unit/components/form/GitNewBranchForm.spec.js
index 27f72eb01..013724c00 100644
--- a/tests/unit/components/form/GitNewBranchForm.spec.js
+++ b/tests/unit/components/form/GitNewBranchForm.spec.js
@@ -3,7 +3,7 @@ import { shallowMount } from '@vue/test-utils';
 import GitNewBranchForm from 'src/components/form/GitNewBranchForm.vue';
 import { Notify } from 'quasar';
 import GitEvent from 'src/composables/events/GitEvent';
-import Project from 'src/composables/Project';
+import * as Git from 'src/composables/Git';
 
 installQuasarPlugin({
   plugins: [Notify],
@@ -15,7 +15,7 @@ jest.mock('vue-i18n', () => ({
   }),
 }));
 
-jest.mock('src/composables/Project', () => ({
+jest.mock('src/composables/Git', () => ({
   getBranches: jest.fn(() => Promise.resolve([{ name: 'test' }])),
   createBranchFrom: jest.fn((id) => {
     if (id === 'error') {
@@ -45,7 +45,7 @@ describe('Test component: GitNewBranchForm', () => {
     gitCheckoutMock = jest.fn();
 
     GitEvent.CheckoutEvent.next.mockImplementation(checkoutNext);
-    Project.gitCheckout.mockImplementation(() => Promise.resolve(gitCheckoutMock()));
+    Git.gitCheckout.mockImplementation(() => Promise.resolve(gitCheckoutMock()));
 
     wrapper = shallowMount(GitNewBranchForm, {
       props: {
diff --git a/tests/unit/components/form/GitPushForm.spec.js b/tests/unit/components/form/GitPushForm.spec.js
index 1e66c016c..8fb7cedf8 100644
--- a/tests/unit/components/form/GitPushForm.spec.js
+++ b/tests/unit/components/form/GitPushForm.spec.js
@@ -21,6 +21,9 @@ jest.mock('src/composables/Project', () => ({
       token: 'token',
     },
   })),
+}));
+
+jest.mock('src/composables/Git', () => ({
   gitPush: jest.fn((project) => {
     if (project.id === 'error') {
       return Promise.reject({ name: 'error' });
diff --git a/tests/unit/components/form/GitUpdateForm.spec.js b/tests/unit/components/form/GitUpdateForm.spec.js
index d0926905d..b072b91e3 100644
--- a/tests/unit/components/form/GitUpdateForm.spec.js
+++ b/tests/unit/components/form/GitUpdateForm.spec.js
@@ -28,6 +28,9 @@ jest.mock('src/composables/Project', () => ({
       token: 'token',
     },
   })),
+}));
+
+jest.mock('src/composables/Git', () => ({
   gitUpdate: jest.fn((project) => {
     if (project.id === 'error') {
       return Promise.reject({ name: 'error' });
diff --git a/tests/unit/components/form/ImportProjectForm.spec.js b/tests/unit/components/form/ImportProjectForm.spec.js
index 50433c89a..4b813c42c 100644
--- a/tests/unit/components/form/ImportProjectForm.spec.js
+++ b/tests/unit/components/form/ImportProjectForm.spec.js
@@ -14,13 +14,6 @@ jest.mock('vue-i18n', () => ({
 }));
 
 jest.mock('src/composables/Project', () => ({
-  importProject: jest.fn((project) => {
-    if (project.id === 'error') {
-      return Promise.reject({ name: 'error' });
-    }
-
-    return Promise.resolve();
-  }),
   getProjects: jest.fn(() => ({
     foo: {
       id: 'foo',
@@ -41,6 +34,16 @@ jest.mock('src/composables/Project', () => ({
   extractProjectName: jest.fn((name) => name),
 }));
 
+jest.mock('src/composables/Git', () => ({
+  importProject: jest.fn((project) => {
+    if (project.id === 'error') {
+      return Promise.reject({ name: 'error' });
+    }
+
+    return Promise.resolve();
+  }),
+}));
+
 describe('Test component: ImportProjectForm', () => {
   let wrapper;
 
diff --git a/tests/unit/components/form/RenameFileForm.spec.js b/tests/unit/components/form/RenameFileForm.spec.js
index 6faa14250..4f989d91e 100644
--- a/tests/unit/components/form/RenameFileForm.spec.js
+++ b/tests/unit/components/form/RenameFileForm.spec.js
@@ -14,13 +14,16 @@ jest.mock('vue-i18n', () => ({
 }));
 
 jest.mock('src/composables/Project', () => ({
-  gitRemove: jest.fn(() => Promise.resolve()),
   readDir: jest.fn(() => ['test']),
   rename: jest.fn(
     (old, rename) => (rename === 'projectName/rename' ? Promise.resolve() : Promise.reject()),
   ),
 }));
 
+jest.mock('src/composables/Git', () => ({
+  gitRemove: jest.fn(() => Promise.resolve()),
+}));
+
 describe('Test component: RenameFileForm', () => {
   let wrapper;
 
diff --git a/tests/unit/components/menu/FileExplorerActionMenu.spec.js b/tests/unit/components/menu/FileExplorerActionMenu.spec.js
index bc540bbe3..8448823bb 100644
--- a/tests/unit/components/menu/FileExplorerActionMenu.spec.js
+++ b/tests/unit/components/menu/FileExplorerActionMenu.spec.js
@@ -21,7 +21,7 @@ jest.mock('src/composables/events/GitEvent', () => ({
   },
 }));
 
-jest.mock('src/composables/Project', () => ({
+jest.mock('src/composables/Git', () => ({
   gitAdd: jest.fn((projectId) => {
     if (projectId === 'error') {
       return Promise.reject({ name: 'error' });
diff --git a/tests/unit/components/menu/GitBranchActionMenu.spec.js b/tests/unit/components/menu/GitBranchActionMenu.spec.js
index d3aadc70b..b8a75d033 100644
--- a/tests/unit/components/menu/GitBranchActionMenu.spec.js
+++ b/tests/unit/components/menu/GitBranchActionMenu.spec.js
@@ -20,7 +20,7 @@ jest.mock('vue-router', () => ({
   useRoute: jest.fn(),
 }));
 
-jest.mock('src/composables/Project', () => ({
+jest.mock('src/composables/Git', () => ({
   gitCheckout: jest.fn((_, id) => {
     if (id === 'error') {
       return Promise.reject(() => 'error');
diff --git a/tests/unit/components/menu/GitBranchMenu.spec.js b/tests/unit/components/menu/GitBranchMenu.spec.js
index f40af4886..32b133830 100644
--- a/tests/unit/components/menu/GitBranchMenu.spec.js
+++ b/tests/unit/components/menu/GitBranchMenu.spec.js
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import { createI18n } from 'vue-i18n';
 import i18nConfiguration from 'src/i18n';
 import { installQuasarPlugin } from '@quasar/quasar-app-extension-testing-unit-jest';
-import Project from 'src/composables/Project';
+import * as Git from 'src/composables/Git';
 
 installQuasarPlugin();
 
@@ -14,9 +14,12 @@ jest.mock('vue-router', () => ({
 }));
 
 jest.mock('src/composables/Project', () => ({
+  getProjectById: jest.fn(),
+}));
+
+jest.mock('src/composables/Git', () => ({
   getBranches: jest.fn(() => Promise.resolve([])),
   gitFetch: jest.fn(() => Promise.resolve()),
-  getProjectById: jest.fn(),
 }));
 
 describe('Test component: GitBranchMenu', () => {
@@ -34,7 +37,7 @@ describe('Test component: GitBranchMenu', () => {
   beforeEach(() => {
     gitFetchMock = jest.fn();
 
-    Project.gitFetch.mockImplementation(() => Promise.resolve(gitFetchMock()));
+    Git.gitFetch.mockImplementation(() => Promise.resolve(gitFetchMock()));
 
     wrapper = shallowMount(GitBranchMenu, {
       props: {
diff --git a/tests/unit/components/tab/FileTabs.spec.js b/tests/unit/components/tab/FileTabs.spec.js
index 922a6d905..b9ec8c8ec 100644
--- a/tests/unit/components/tab/FileTabs.spec.js
+++ b/tests/unit/components/tab/FileTabs.spec.js
@@ -4,6 +4,7 @@ import FileTabs from 'src/components/tab/FileTabs.vue';
 import FileEvent from 'src/composables/events/FileEvent';
 import GitEvent from 'src/composables/events/GitEvent';
 import * as Project from 'src/composables/Project';
+import * as Git from 'src/composables/Git';
 
 installQuasarPlugin();
 
@@ -47,10 +48,13 @@ jest.mock('src/composables/events/GitEvent', () => ({
 }));
 
 jest.mock('src/composables/Project', () => ({
-  getStatus: jest.fn(),
   exists: jest.fn(),
 }));
 
+jest.mock('src/composables/Git', () => ({
+  getStatus: jest.fn(),
+}));
+
 describe('Test component: FileTabs', () => {
   let wrapper;
 
@@ -314,7 +318,7 @@ describe('Test component: FileTabs', () => {
       wrapper.vm.fileTabArray = [];
       const getStatus = jest.fn();
 
-      Project.getStatus.mockImplementation(getStatus);
+      Git.getStatus.mockImplementation(getStatus);
 
       expect(getStatus).toHaveBeenCalledTimes(0);
 
@@ -329,7 +333,7 @@ describe('Test component: FileTabs', () => {
       wrapper.vm.fileTabArray = [{ id: 'path' }];
       const getStatus = jest.fn(() => Promise.resolve([information]));
 
-      Project.getStatus.mockImplementation(getStatus);
+      Git.getStatus.mockImplementation(getStatus);
 
       expect(getStatus).toHaveBeenCalledTimes(0);
 
diff --git a/tests/unit/composables/Git.spec.js b/tests/unit/composables/Git.spec.js
new file mode 100644
index 000000000..dc1c75113
--- /dev/null
+++ b/tests/unit/composables/Git.spec.js
@@ -0,0 +1,315 @@
+import {
+  gitInit,
+  gitAddRemote,
+  getCurrentBranch,
+  gitFetch,
+  getBranches,
+  gitCheckout,
+  createBranchFrom,
+  gitUpdate,
+  getStatus,
+  gitListFiles,
+  gitPush,
+  gitAdd,
+  gitRemove,
+  gitCommit,
+  gitLog,
+  gitGlobalUpload,
+  importProject,
+} from 'src/composables/Git';
+import Branch from 'src/models/git/Branch';
+import git from 'isomorphic-git';
+import FileStatus from 'src/models/git/FileStatus';
+
+jest.mock('isomorphic-git', () => ({
+  init: jest.fn(() => Promise.resolve('init')),
+  clone: jest.fn(({ onAuth }) => {
+    onAuth();
+
+    return Promise.resolve('clone');
+  }),
+  branch: jest.fn(({ ref }) => {
+    if (ref === 'error') {
+      return Promise.reject({ message: 'ERROR' });
+    }
+
+    if (ref === 'enotdir') {
+      return Promise.reject({ message: 'ENOTDIR: File is not a directory.' });
+    }
+
+    return Promise.resolve('branch');
+  }),
+  addRemote: jest.fn(() => Promise.resolve('addRemote')),
+  fetch: jest.fn(),
+  checkout: jest.fn(() => Promise.resolve('checkout')),
+  listFiles: jest.fn(() => Promise.resolve(['/test/file.txt'])),
+  listBranches: jest.fn(({ remote }) => {
+    if (!remote) {
+      return Promise.resolve(['HEAD', 'main', 'local']);
+    }
+
+    return Promise.resolve(['HEAD', 'main', 'remote']);
+  }),
+  currentBranch: jest.fn(() => Promise.resolve('main')),
+  pull: jest.fn(({ onAuth }) => {
+    onAuth();
+
+    return Promise.resolve('pull');
+  }),
+  statusMatrix: jest.fn(() => Promise.resolve([['test', 0, 1, 2]])),
+  push: jest.fn(({ onAuth }) => {
+    onAuth();
+
+    return Promise.resolve('pull');
+  }),
+  add: jest.fn(() => Promise.resolve('add')),
+  remove: jest.fn(() => Promise.resolve('remove')),
+  commit: jest.fn(() => Promise.resolve('SHA-1')),
+  log: jest.fn(() => Promise.resolve(['log'])),
+}));
+
+jest.mock('src/composables/Project', () => ({
+  saveProject: () => Promise.resolve(),
+}));
+
+describe('Test composable: Git', () => {
+  let gitFetchMock;
+
+  beforeEach(() => {
+    localStorage.clear();
+    gitFetchMock = jest.fn(({ onAuth }) => {
+      onAuth();
+
+      return Promise.resolve('fetch');
+    });
+
+    git.fetch.mockImplementation(gitFetchMock);
+  });
+
+  describe('Test function: gitInit', () => {
+    it('should call git init', async () => {
+      await gitInit('foo');
+      expect(git.init).toBeCalled();
+    });
+  });
+
+  describe('Test function: importProject', () => {
+    it('should call git clone', async () => {
+      await importProject({
+        id: 'foo',
+        git: {
+          repository: 'test',
+          username: 'test',
+          token: 'test',
+        },
+      });
+      expect(git.clone).toBeCalled();
+    });
+  });
+
+  describe('Test function: gitAddRemote', () => {
+    it('should call all needed git method', async () => {
+      await gitAddRemote({
+        id: 'test',
+        git: {
+          repository: 'test',
+          username: 'test',
+          token: 'test',
+        },
+      });
+
+      expect(git.addRemote).toBeCalled();
+    });
+  });
+
+  describe('Test function: gitFetch', () => {
+    it('should not call git.fetch', async () => {
+      const result = await gitFetch({});
+
+      expect(gitFetchMock).not.toBeCalled();
+      expect(result).toBeUndefined();
+    });
+
+    it('should call git.fetch', async () => {
+      const result = await gitFetch({ git: { repository: 'test' } });
+
+      expect(gitFetchMock).toBeCalled();
+      expect(result).toEqual('fetch');
+    });
+  });
+
+  describe('Test function: gitCheckout', () => {
+    it('should emit checkout event', async () => {
+      const result = await gitCheckout('projectId', 'test').then(() => 'success');
+
+      expect(result).toEqual('success');
+    });
+  });
+
+  describe('Test function: getCurrentBranch', () => {
+    it('should return current branch name', async () => {
+      const result = await getCurrentBranch('test');
+
+      expect(result).toEqual('main');
+    });
+  });
+
+  describe('Test function: getBranches', () => {
+    it('should return valid branches', async () => {
+      const branches = await getBranches('test');
+
+      expect(branches).toEqual([
+        new Branch({
+          name: 'main',
+          onLocal: true,
+          onRemote: true,
+          remote: 'origin',
+        }),
+        new Branch({
+          name: 'local',
+          onLocal: true,
+          onRemote: false,
+          remote: 'origin',
+        }),
+        new Branch({
+          name: 'remote',
+          onLocal: false,
+          onRemote: true,
+          remote: 'origin',
+        }),
+      ]);
+    });
+  });
+
+  describe('Test function: createBranchFrom', () => {
+    it('should succeed when there is no issue', async () => {
+      const result = await createBranchFrom('test', 'branch', 'main').then(() => 'success');
+
+      expect(result).toEqual('success');
+    });
+
+    it('should fail in case of ENOTDIR', async () => {
+      const error = await createBranchFrom('test', 'enotdir', 'main').catch(({ message }) => message);
+
+      expect(error).toEqual('ENOTDIR: File is not a directory.');
+    });
+
+    it('should fail in case of ERROR', async () => {
+      const error = await createBranchFrom('test', 'error', 'main').catch(({ message }) => message);
+
+      expect(error).toEqual('ERROR');
+    });
+  });
+
+  describe('Test function: gitUpdate', () => {
+    it('should call git pull', async () => {
+      await gitUpdate(
+        {
+          id: 'test',
+          git: {
+            username: 'username',
+            token: 'token',
+          },
+        },
+        'branch',
+        true,
+      );
+
+      expect(git.pull).toBeCalled();
+    });
+  });
+
+  describe('Test function: getStatus', () => {
+    it('should be a success and return an array with one valid FileStatus', async () => {
+      expect(await getStatus()).toEqual([new FileStatus({
+        path: 'test',
+        headStatus: 0,
+        workdirStatus: 1,
+        stageStatus: 2,
+      })]);
+    });
+  });
+
+  describe('Test function: gitListFiles', () => {
+    it('should be a success and return an array with list of filePaths', async () => {
+      expect(await gitListFiles()).toEqual(['/test/file.txt']);
+    });
+  });
+
+  describe('Test function: gitPush', () => {
+    it('should call git push and emit event', async () => {
+      await gitPush(
+        {
+          id: 'test',
+          git: {
+            username: 'username',
+            token: 'token',
+          },
+        },
+        'branch',
+        true,
+      );
+
+      expect(git.push).toBeCalled();
+    });
+  });
+
+  describe('Test function: gitAdd', () => {
+    it('should call git add', async () => {
+      await gitAdd('projectId', 'filepath');
+
+      // expect(gitAddMock).toBeCalled();
+      expect(git.add).toBeCalled();
+    });
+  });
+
+  describe('Test function: gitRemove', () => {
+    it('should call git remove', async () => {
+      await gitRemove('projectId', 'filepath');
+
+      // expect(gitRemoveMock).toBeCalled();
+      expect(git.remove).toBeCalled();
+    });
+  });
+
+  describe('Test function: gitCommit', () => {
+    it('should call git commit and return SHA-1', async () => {
+      let result = await gitCommit('test', 'wip');
+      expect(result).toEqual('SHA-1');
+
+      result = await gitCommit('test', 'wip', true);
+      expect(result).toEqual('SHA-1');
+    });
+  });
+
+  describe('Test function: gitGlobalUpload', () => {
+    it('should succeed', async () => {
+      const result = await gitGlobalUpload({
+        git: {
+          username: 'username',
+          token: 'token',
+        },
+      }).then(() => 'success');
+
+      expect(result).toEqual('success');
+    });
+  });
+
+  describe('Test function: gitLog', () => {
+    it('should return valid log', async () => {
+      const result = await gitLog('test', 'main');
+
+      expect(result).toEqual(['log']);
+    });
+
+    it('should call git log with default depth', async () => {
+      await gitLog('test', 'main');
+      expect(git.log).toBeCalledWith(expect.objectContaining({ depth: 25 }));
+    });
+
+    it('should call git log with specified depth', async () => {
+      await gitLog('test', 'main', 1);
+      expect(git.log).toBeCalledWith(expect.objectContaining({ depth: 1 }));
+    });
+  });
+});
diff --git a/tests/unit/composables/Project.spec.js b/tests/unit/composables/Project.spec.js
index 2701b22b7..74e547474 100644
--- a/tests/unit/composables/Project.spec.js
+++ b/tests/unit/composables/Project.spec.js
@@ -7,13 +7,6 @@ import {
   initProject,
   getProjectFiles,
   readProjectFile,
-  gitAddRemote,
-  getCurrentBranch,
-  gitFetch,
-  getBranches,
-  gitCheckout,
-  createBranchFrom,
-  gitUpdate,
   createProjectFolder,
   writeProjectFile,
   appendProjectFile,
@@ -23,15 +16,6 @@ import {
   deleteProjectDir,
   deleteProjectFile,
   deleteDiagramFile,
-  getStatus,
-  gitListFiles,
-  gitPush,
-  gitAdd,
-  gitRemove,
-  gitCommit,
-  gitLog,
-  gitGlobalUpload,
-  importProject,
   PROJECT_STORAGE_KEY,
   getAllModels,
   getModelFiles,
@@ -41,61 +25,14 @@ import {
   extractProjectName,
   getProjectFolders,
 } from 'src/composables/Project';
+import {
+  gitInit,
+  gitAdd,
+  gitCommit,
+} from 'src/composables/Git';
 import { FileInformation, FileInput } from 'leto-modelizer-plugin-core';
-import Branch from 'src/models/git/Branch';
-import git from 'isomorphic-git';
-import FileStatus from 'src/models/git/FileStatus';
 import Project from 'src/models/Project';
 
-jest.mock('isomorphic-git', () => ({
-  init: jest.fn(() => Promise.resolve('init')),
-  clone: jest.fn(({ onAuth }) => {
-    onAuth();
-
-    return Promise.resolve('clone');
-  }),
-  branch: jest.fn(({ ref }) => {
-    if (ref === 'error') {
-      return Promise.reject({ message: 'ERROR' });
-    }
-
-    if (ref === 'enotdir') {
-      return Promise.reject({ message: 'ENOTDIR: File is not a directory.' });
-    }
-
-    return Promise.resolve('branch');
-  }),
-  addRemote: jest.fn(() => Promise.resolve('addRemote')),
-  fetch: jest.fn(),
-  checkout: jest.fn(() => Promise.resolve('checkout')),
-  listFiles: jest.fn(() => Promise.resolve(['/test/file.txt'])),
-  listBranches: jest.fn(({ remote }) => {
-    if (!remote) {
-      return Promise.resolve(['HEAD', 'main', 'local']);
-    }
-
-    return Promise.resolve(['HEAD', 'main', 'remote']);
-  }),
-  resolveRef: jest.fn(() => Promise.resolve('resolveRef')),
-  readBlob: jest.fn(() => Promise.resolve({ blob: 'test' })),
-  currentBranch: jest.fn(() => Promise.resolve('main')),
-  pull: jest.fn(({ onAuth }) => {
-    onAuth();
-
-    return Promise.resolve('pull');
-  }),
-  statusMatrix: jest.fn(() => Promise.resolve([['test', 0, 1, 2]])),
-  push: jest.fn(({ onAuth }) => {
-    onAuth();
-
-    return Promise.resolve('pull');
-  }),
-  add: jest.fn(() => Promise.resolve('add')),
-  remove: jest.fn(() => Promise.resolve('remove')),
-  commit: jest.fn(() => Promise.resolve('SHA-1')),
-  log: jest.fn(() => Promise.resolve(['log'])),
-}));
-
 jest.mock('browserfs', () => ({
   install: jest.fn(),
   configure: jest.fn(),
@@ -166,8 +103,6 @@ jest.mock('browserfs', () => ({
 jest.mock('src/composables/PluginManager', () => ({
   getFileInputs: () => [],
   getPlugins: () => [],
-  getPluginTags: () => [],
-  isParsableFile: () => true,
   getPluginByName: jest.fn(() => ({
     isParsable: () => true,
     configuration: {
@@ -176,27 +111,17 @@ jest.mock('src/composables/PluginManager', () => ({
   })),
 }));
 
-describe('Test composable: Project', () => {
-  let gitAddMock;
-  let gitRemoveMock;
-  let gitAddRemoteMock;
-  let gitFetchMock;
+jest.mock('src/composables/Git', () => ({
+  gitListFiles: () => [],
+  gitRemove: () => Promise.resolve(),
+  gitInit: jest.fn(() => Promise.resolve()),
+  gitAdd: jest.fn(() => Promise.resolve()),
+  gitCommit: jest.fn(() => Promise.resolve()),
+}));
 
+describe('Test composable: Project', () => {
   beforeEach(() => {
     localStorage.clear();
-    gitAddMock = jest.fn();
-    gitRemoveMock = jest.fn();
-    gitAddRemoteMock = jest.fn();
-    gitFetchMock = jest.fn(({ onAuth }) => {
-      onAuth();
-
-      return Promise.resolve('fetch');
-    });
-
-    git.add.mockImplementation(gitAddMock);
-    git.remove.mockImplementation(gitRemoveMock);
-    git.fetch.mockImplementation(gitFetchMock);
-    git.addRemote.mockImplementation(gitAddRemoteMock);
   });
 
   describe('Test function: getProjects', () => {
@@ -305,24 +230,15 @@ describe('Test composable: Project', () => {
 
   describe('Test function: initProject', () => {
     it('should init and create commit with default file', async () => {
+      gitInit.mockResolvedValueOnce();
+      gitAdd.mockResolvedValueOnce();
+      gitCommit.mockResolvedValueOnce();
+
       await initProject({ id: 'foo' });
-      expect(git.init).toBeCalled();
-      expect(git.add).toBeCalled();
-      expect(git.commit).toBeCalled();
-    });
-  });
 
-  describe('Test function: importProject', () => {
-    it('should call git clone', async () => {
-      await importProject({
-        id: 'foo',
-        git: {
-          repository: 'test',
-          username: 'test',
-          token: 'test',
-        },
-      });
-      expect(git.clone).toBeCalled();
+      expect(gitInit).toHaveBeenCalledWith('foo');
+      expect(gitAdd).toHaveBeenCalledWith('foo', 'README.md');
+      expect(gitCommit).toHaveBeenCalledWith('foo', 'Initial commit.');
     });
   });
 
@@ -396,55 +312,6 @@ describe('Test composable: Project', () => {
     });
   });
 
-  describe('Test function: gitAddRemote', () => {
-    it('should call all needed git method', async () => {
-      localStorage.setItem(PROJECT_STORAGE_KEY, JSON.stringify({
-        test: {
-          id: 'test',
-          git: {
-            repository: 'test',
-            username: 'test',
-            token: 'test',
-          },
-        },
-      }));
-      await gitAddRemote({
-        id: 'test',
-        git: {
-          repository: 'test',
-          username: 'test',
-          token: 'test',
-        },
-      });
-
-      expect(gitAddRemoteMock).toBeCalled();
-    });
-  });
-
-  describe('Test function: gitFetch', () => {
-    it('should not call git.fetch', async () => {
-      const result = await gitFetch({});
-
-      expect(gitFetchMock).not.toBeCalled();
-      expect(result).toBeUndefined();
-    });
-
-    it('should call git.fetch', async () => {
-      const result = await gitFetch({ git: { repository: 'test' } });
-
-      expect(gitFetchMock).toBeCalled();
-      expect(result).toEqual('fetch');
-    });
-  });
-
-  describe('Test function: gitCheckout', () => {
-    it('should emit checkout event', async () => {
-      const result = await gitCheckout('projectId', 'test').then(() => 'success');
-
-      expect(result).toEqual('success');
-    });
-  });
-
   describe('Test function: getProjectFiles', () => {
     it('should return file information array', async () => {
       localStorage.setItem(PROJECT_STORAGE_KEY, JSON.stringify({
@@ -488,79 +355,6 @@ describe('Test composable: Project', () => {
     });
   });
 
-  describe('Test function: getCurrentBranch', () => {
-    it('should return current branch name', async () => {
-      const result = await getCurrentBranch('test');
-
-      expect(result).toEqual('main');
-    });
-  });
-
-  describe('Test function: getBranches', () => {
-    it('should return valid branches', async () => {
-      const branches = await getBranches('test');
-
-      expect(branches).toEqual([
-        new Branch({
-          name: 'main',
-          onLocal: true,
-          onRemote: true,
-          remote: 'origin',
-        }),
-        new Branch({
-          name: 'local',
-          onLocal: true,
-          onRemote: false,
-          remote: 'origin',
-        }),
-        new Branch({
-          name: 'remote',
-          onLocal: false,
-          onRemote: true,
-          remote: 'origin',
-        }),
-      ]);
-    });
-  });
-
-  describe('Test function: createBranchFrom', () => {
-    it('should succeed when there is no issue', async () => {
-      const result = await createBranchFrom('test', 'branch', 'main').then(() => 'success');
-
-      expect(result).toEqual('success');
-    });
-
-    it('should fail in case of ENOTDIR', async () => {
-      const error = await createBranchFrom('test', 'enotdir', 'main').catch(({ message }) => message);
-
-      expect(error).toEqual('ENOTDIR: File is not a directory.');
-    });
-
-    it('should fail in case of ERROR', async () => {
-      const error = await createBranchFrom('test', 'error', 'main').catch(({ message }) => message);
-
-      expect(error).toEqual('ERROR');
-    });
-  });
-
-  describe('Test function: gitUpdate', () => {
-    it('should call git pull', async () => {
-      await gitUpdate(
-        {
-          id: 'test',
-          git: {
-            username: 'username',
-            token: 'token',
-          },
-        },
-        'branch',
-        true,
-      );
-
-      expect(git.pull).toBeCalled();
-    });
-  });
-
   describe('Test function: rmDir', () => {
     it('should be a success on good path', async () => {
       expect(await rmDir('ok')).toBeUndefined();
@@ -617,98 +411,6 @@ describe('Test composable: Project', () => {
     });
   });
 
-  describe('Test function: getStatus', () => {
-    it('should be a success and return an array with one valid FileStatus', async () => {
-      expect(await getStatus()).toEqual([new FileStatus({
-        path: 'test',
-        headStatus: 0,
-        workdirStatus: 1,
-        stageStatus: 2,
-      })]);
-    });
-  });
-
-  describe('Test function: gitListFiles', () => {
-    it('should be a success and return an array with list of filePaths', async () => {
-      expect(await gitListFiles()).toEqual(['/test/file.txt']);
-    });
-  });
-
-  describe('Test function: gitPush', () => {
-    it('should call git push and emit event', async () => {
-      await gitPush(
-        {
-          id: 'test',
-          git: {
-            username: 'username',
-            token: 'token',
-          },
-        },
-        'branch',
-        true,
-      );
-
-      expect(git.push).toBeCalled();
-    });
-  });
-
-  describe('Test function: gitAdd', () => {
-    it('should call git add', async () => {
-      await gitAdd('projectId', 'filepath');
-
-      expect(gitAddMock).toBeCalled();
-    });
-  });
-
-  describe('Test function: gitRemove', () => {
-    it('should call git remove', async () => {
-      await gitRemove('projectId', 'filepath');
-
-      expect(gitRemoveMock).toBeCalled();
-    });
-  });
-
-  describe('Test function: gitCommit', () => {
-    it('should call git commit and return SHA-1', async () => {
-      let result = await gitCommit('test', 'wip');
-      expect(result).toEqual('SHA-1');
-
-      result = await gitCommit('test', 'wip', true);
-      expect(result).toEqual('SHA-1');
-    });
-  });
-
-  describe('Test function: gitGlobalUpload', () => {
-    it('should succeed', async () => {
-      const result = await gitGlobalUpload({
-        git: {
-          username: 'username',
-          token: 'token',
-        },
-      }).then(() => 'success');
-
-      expect(result).toEqual('success');
-    });
-  });
-
-  describe('Test function: gitLog', () => {
-    it('should return valid log', async () => {
-      const result = await gitLog('test', 'main');
-
-      expect(result).toEqual(['log']);
-    });
-
-    it('should call git log with default depth', async () => {
-      await gitLog('test', 'main');
-      expect(git.log).toBeCalledWith(expect.objectContaining({ depth: 25 }));
-    });
-
-    it('should call git log with specified depth', async () => {
-      await gitLog('test', 'main', 1);
-      expect(git.log).toBeCalledWith(expect.objectContaining({ depth: 1 }));
-    });
-  });
-
   describe('Test function: getAllModels', () => {
     it('should return an empty array', async () => {
       expect(await getAllModels('test')).toEqual([]);