Skip to content

Commit

Permalink
Merge pull request #1310 from jnm2/fix_error_copying_authors_file
Browse files Browse the repository at this point in the history
Interpret authors file path relative to the current directory at the time the command was executed
  • Loading branch information
pmiossec committed Dec 6, 2019
2 parents 91f960a + f71d5c9 commit 25c87e2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion doc/release-notes/NEXT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
* Remove support for building an MSI package. It was broken since 6732259 ("Moving source in the 'src' folder", 2017-10-13)
and the official distribution channel for binaries is a ZIP file or a chocolatey package.

* Added a new command to create a mapping file of changet ids and commit ids.
* Added a new command to create a mapping file of changet ids and commit ids.

* Fixed authors file not being found for the copy to .git/git-tfs_authors due to git-tfs changing the current directory before initiating the copy.
3 changes: 2 additions & 1 deletion src/GitTfs/Globals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.IO;
using NDesk.Options;
using GitTfs.Core;
using GitTfs.Util;
Expand All @@ -26,7 +27,7 @@ public OptionSet OptionSet
{ "i|tfs-remote|remote|id=", "The remote ID of the TFS to interact with\ndefault: default",
v => UserSpecifiedRemoteId = v },
{ "A|authors=", "Path to an Authors file to map TFS users to Git users (will be kept in cache and used for all the following commands)",
v => AuthorsFilePath = v },
v => AuthorsFilePath = Path.GetFullPath(v) },
};
}
}
Expand Down

0 comments on commit 25c87e2

Please sign in to comment.