gittf Wiki Rss Feed

New Comment on "Checkin"

brianlow — Mon, 06 May 2013 17:03:25 GMT

I believe the --deep option is enabled by default if you cloned your repository with --deep.

Updated Wiki: Home

martin — Fri, 15 Feb 2013 17:47:59 GMT

Project Description
Git-TF is a set of cross-platform, command line tools that facilitate sharing of changes between TFS and Git.

These tools make it easy to clone sources from TFS, fetch updates from TFS, and update TFS with changes committed locally in Git.

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.2

Git-TF 2.0.2 has been released to fix a couple of very important issues around connecting to your hosted instance at visualstudio.com and in using Git-TF with the latest version of Java 7 from Oracle on Mac OS X. In the 2.0 release, the highlights also include:

Add associated Work Item information to commit comments
Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

The easiest way if you are a user of Chocolatey is to type “cinst Git-TF” at a command prompt on a machine where Chocolatey is installed. But to set up Git-TF manually then do the following steps once you have installed Java:

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs/mycollection $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs/mycollection $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

New Comment on "Building from command line"

l_o_l — Thu, 07 Feb 2013 14:09:24 GMT

This now builds correctly thanks.

New Comment on "Building from command line"

amaechler — Tue, 05 Feb 2013 18:46:03 GMT

For some reason, the version of maven that comes with OSX does not build git-tf successfully. If you use the the maven binaries from the apache download site, git-tf compiles perfectly (that is on OSX 10.8).

Updated Wiki: Home

arukhlin — Tue, 05 Feb 2013 16:05:22 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Git-TF 2.0.1 has been released to fix a couple of very important issues around connecting to your hosted instance at visualstudio.com and in using Git-TF with the latest version of Java 7 from Oracle on Mac OS X. In the 2.0 release, the highlights also include:

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs/mycollection $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs/mycollection $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

Updated Wiki: Home

arukhlin — Tue, 05 Feb 2013 16:04:13 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs/mycollection $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs/mycollection $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

New Comment on "Building from command line"

arukhlin — Wed, 30 Jan 2013 21:08:03 GMT

Hi l_o_l, Thanks for your finding. The bug in the unit test has been fixed. Could you please try again with the latest sources? Alex

Updated Wiki: Home

martin — Wed, 30 Jan 2013 02:27:43 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

New Comment on "Building from command line"

l_o_l — Tue, 22 Jan 2013 18:13:27 GMT

No luck building the project, I get the following error: ------------------------------------------------------- T E S T S ------------------------------------------------------- Running com.microsoft.gittf.client.clc.arguments.parser.ArgumentParserTest Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.033 sec <<< FAILURE! Running com.microsoft.gittf.client.clc.MessagesTest Processed properties file src\main\resources/com/microsoft/gittf/client/clc/messages.properties Found 185 properties. Found 42 java files. Found 46 parameterized messages. Found 251 message references. Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.048 sec Results : Tests in error: initializationError(com.microsoft.gittf.client.clc.arguments.parser.ArgumentParserTest): (class: com/microsoft/gittf/client/clc/arguments/ArgumentOptions, method: <init> signature: (I)V) Constructor must call super() or this()

New Comment on "Checkin"

brianlow — Wed, 16 Jan 2013 21:23:33 GMT

--renamemode=all --renamemode=justfiles (this is the default in v2.0.1 release Jan 8, 2013) Affects folder renames but not sure exactly how.

New Comment on "Checkin"

weisjohn — Mon, 14 Jan 2013 02:45:14 GMT

can you add some docs here surrounding what happens on a successful checkin? I stumbled across this on a repo that I'm working on, are these only made if a successful checkin happens?: ``` $ git tag TFS_C32171 TFS_C32319 TFS_C32320 TFS_C32321 TFS_C32322 ```

Updated Wiki: Home

martin — Wed, 09 Jan 2013 18:23:09 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

Updated Wiki: Home

martin — Tue, 08 Jan 2013 19:35:59 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

Updated Wiki: Home

martin — Tue, 08 Jan 2013 16:20:36 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

The easiest way if you are a user of Chocolatey is to type “cinst gittf” at a command prompt on a machine where Chocolatey is installed. But to set up Git-TF manually then do the following steps once you have installed Java:

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

Updated Wiki: Home

martin — Tue, 08 Jan 2013 16:14:50 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

Updated Wiki: Home

martin — Tue, 08 Jan 2013 15:56:21 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

Updated Wiki: Home

martin — Tue, 08 Jan 2013 15:50:07 GMT

Downloads

Latest Release

Get the latest binary release from the Microsoft download page. If you want the very latest bits then you could also build from the source.

Current Build: Git-TF 2.0.1

Full support for shelvesets (Shelve, Unshelve, and listing Shelvesets)
Support for file and folder renames when shelving and checking in to TFS
Support for gated builds
Created a Chocolately package
Numerous bug fixes including some performance improvements

Installing Git-TF

Extract the contents of git-tf-2.0.1.20130107.zip to a folder on your local machine, i.e. C:\git-tf on Windows, or /user/git-tf on Mac/Linux.
Add the path where you extracted Git-TF (i.e. C:\git-tf) to your PATH environment variable.
Add the path where java.exe is installed (i.e. C:\Program Files (x86)\Java\jre7\bin) to your PATH environment variable.

Example Usage

Individual developer with a New Repo

A typical workflow for an individual developer using the Git-TF tools are as follows.

git tf clone http://myserver:8080/tfs $/TeamProjectA/Main
Make changes to the file in the Git repo
git commit -a -m "commit one" (commit changes locally)
Make more changes
git commit -a -m "commit two"
git tf pull --rebase
git tf checkin

Development Team with an Existing Repo

For a team working with an existing Git repo, a developer sharing changes to TFS using Git-TF would use the following workflow. For details, see Working with Teams.

git tf configure http://myserver:8080/tfs $/TeamProjectA/Main
git tf pull
git commit -a -m "merge commit"
git tf checkin
git push

Commands

Contributing

Interested in contributing? Learn about how you can contribute.

Additional resources

Articles about Git-TF

Updated Wiki: Documentation

martin — Tue, 08 Jan 2013 12:57:38 GMT

Getting Started

See Home

Installing Git-TF

See Home

Example Usage

See Home

Recommended Git Settings

See Recommended Git Settings

Updated Wiki: Recommended Git Settings

martin — Tue, 08 Jan 2013 12:49:32 GMT

When using the Git-TF tools, there are a few recommended settings that should make it easier to work with other developers that are using TFS.

Line Endings

core.autocrlf = false

Git has a feature to allow line endings to be normalized for a repository, and it provides options for how those line endings should be set when files are checked out. TFS does not have any feature to normalize line endings - it stores exactly what is checked in by the user. When using Git-TF, choosing to normalize line endings to Unix-style line endings (LF) will likely result in TFS users (especially those using VS) changing the line endings back to Windows-style line endings (CRLF). As a result, it is recommended to set the core.autocrlf option to false, which will keep line endings unchanged in the Git repo.

Ignore case

core.ignorecase = true

TFS does not allow multiple files that differ only in case to exist in the same folder at the same time. Git users working on non-Windows machines could commit files to their repo that differ only in case, and attempting to check in those changes to TFS will result in an error. To avoid these types of errors, the core.ignorecase option should be set to true.

.gitignore

Having a .gitignore file for your project helps make sure that only the files you care about are versioned, and not the files that are just temporary or for your local machine only. Take a look at the gitignore project on GitHub for sample .gitignore files for various application types including C# and VB.NET

New Comment on "Configure"

riotgibbon — Fri, 23 Nov 2012 11:20:17 GMT

yeah, I realised after posting this - reposted to http://gittf.codeplex.com/discussions/404265 hopefully somebody there will be able to help thanks for pointing this out