From 85697bacbae40233590ec749fc60f394397a02b8 Mon Sep 17 00:00:00 2001 From: Philippe Miossec Date: Thu, 14 Nov 2013 15:08:23 +0100 Subject: [PATCH] Load author file during rcheckin ...because there is fetch of commit even during rcheckin command --- GitTfs/Commands/Rcheckin.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/GitTfs/Commands/Rcheckin.cs b/GitTfs/Commands/Rcheckin.cs index f2512d5a..a84d5c5b 100644 --- a/GitTfs/Commands/Rcheckin.cs +++ b/GitTfs/Commands/Rcheckin.cs @@ -19,18 +19,20 @@ namespace Sep.Git.Tfs.Commands private readonly CommitSpecificCheckinOptionsFactory _checkinOptionsFactory; private readonly TfsWriter _writer; private readonly Globals _globals; + private readonly AuthorsFile _authors; private bool Quick { get; set; } private bool AutoRebase { get; set; } private bool ForceCheckin { get; set; } - public Rcheckin(TextWriter stdout, CheckinOptions checkinOptions, TfsWriter writer, Globals globals) + public Rcheckin(TextWriter stdout, CheckinOptions checkinOptions, TfsWriter writer, Globals globals, AuthorsFile authors) { _stdout = stdout; _checkinOptions = checkinOptions; _checkinOptionsFactory = new CommitSpecificCheckinOptionsFactory(_stdout, globals); _writer = writer; _globals = globals; + _authors = authors; } public OptionSet OptionSet @@ -53,6 +55,8 @@ namespace Sep.Git.Tfs.Commands if (_globals.Repository.IsBare) throw new GitTfsException("error: you should specify the local branch to checkin for a bare repository."); + _authors.Parse(null, _globals.GitDir); + return _writer.Write("HEAD", PerformRCheckin); } @@ -62,6 +66,8 @@ namespace Sep.Git.Tfs.Commands if (!_globals.Repository.IsBare) throw new GitTfsException("error: This syntax with one parameter is only allowed in bare repository."); + _authors.Parse(null, _globals.GitDir); + return _writer.Write(GitRepository.ShortToLocalName(localBranch), PerformRCheckin); }