From 19cd3b88165ebc560adabfb54236277c2a4e7d44 Mon Sep 17 00:00:00 2001 From: Philippe Miossec Date: Fri, 22 Dec 2017 21:17:06 +0100 Subject: [PATCH] Better copy the author file just after the creation of the repository --- src/GitTfs/Commands/Init.cs | 11 ++++++++++- src/GitTfs/GitTfs.cs | 5 ----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/GitTfs/Commands/Init.cs b/src/GitTfs/Commands/Init.cs index b9d32d862..2321cb177 100644 --- a/src/GitTfs/Commands/Init.cs +++ b/src/GitTfs/Commands/Init.cs @@ -6,6 +6,7 @@ using System.Text.RegularExpressions; using NDesk.Options; using GitTfs.Core; +using GitTfs.Util; using StructureMap; namespace GitTfs.Commands @@ -18,11 +19,13 @@ public class Init : GitTfsCommand private readonly RemoteOptions _remoteOptions; private readonly Globals _globals; private readonly IGitHelpers _gitHelper; + private readonly AuthorsFile _authorsFileHelper; - public Init(RemoteOptions remoteOptions, InitOptions initOptions, Globals globals, IGitHelpers gitHelper) + public Init(RemoteOptions remoteOptions, InitOptions initOptions, Globals globals, IGitHelpers gitHelper, AuthorsFile authorsFileHelper) { _remoteOptions = remoteOptions; _gitHelper = gitHelper; + _authorsFileHelper = authorsFileHelper; _globals = globals; _initOptions = initOptions; } @@ -46,11 +49,17 @@ public int Run(string tfsUrl, string tfsRepositoryPath) { tfsRepositoryPath.AssertValidTfsPathOrRoot(); DoGitInitDb(); + SaveAuthorFileInRepository(); CommitTheGitIgnoreFile(_initOptions.GitIgnorePath); GitTfsInit(tfsUrl, tfsRepositoryPath); return 0; } + private void SaveAuthorFileInRepository() + { + _authorsFileHelper.SaveAuthorFileInRepository(_globals.AuthorsFilePath, _globals.GitDir); + } + private void CommitTheGitIgnoreFile(string pathToGitIgnoreFile) { if (string.IsNullOrWhiteSpace(pathToGitIgnoreFile)) diff --git a/src/GitTfs/GitTfs.cs b/src/GitTfs/GitTfs.cs index 03dd8becb..84ade4c53 100644 --- a/src/GitTfs/GitTfs.cs +++ b/src/GitTfs/GitTfs.cs @@ -107,11 +107,6 @@ private void ParseAuthorsAndSave(bool couldSaveAuthorFile) } } - private void SaveAuthorFileInRepository() - { - _container.GetInstance().SaveAuthorFileInRepository(_globals.AuthorsFilePath, _globals.GitDir); - } - public void InitializeGlobals() { var git = _container.GetInstance();