Questions tagged [git-tfs]

Git-Tfs is a Windows open sourced two-way bridge between TFS(TFVC) and git, similar to git-svn.

Git-tfs is a command-line based source control bridge that allows you to work with Git locally, reducing the number of operations to communicate with the TFS source control server to exactly three operations: Clone, Checkin and Fetch (or Pull).

Major features

  • Clone a TFVC repository in a git repository
  • Syncing new changesets/commits (fetch, pull and rcheckin)
  • TFS branch support with merge support
  • Shelveset support
  • Workitems support
  • Migrate from TFVC to Git

Online resources

204 questions
2
votes
2 answers

git tfs: How to rcheckin git commits when there is another checkin in tfs?

For a remote-worker without access to our TFS we cloned a TFS repository using git tfs. When we got back his repository we saw that he worked on a new feature branch. Before trying to rcheckin his changes, we merged his feature branch into the…
paulroho
  • 1,234
  • 1
  • 11
  • 27
2
votes
0 answers

Merge two Git repositories imported through git-tfs

We've been using git-tfs to import three major folders which lived side-by-side in our TFS repository in three individual Git repositories. Now we want to merge the two of them together using git --filter-branch. Is there a way to do this without…
Dennis Doomen
  • 8,368
  • 1
  • 32
  • 44
2
votes
1 answer

How can I clean up a broken history with git-tfs

I'm not sure how I managed to get into this state(*), but I've got some commits in my tfs/default remote branch that don't exist in TFS, so I want to get rid of them. So my history looks like this: A--B--C--D tfs/default ... but commits B and C…
Anders
  • 544
  • 2
  • 8
2
votes
1 answer

How do I get the TFS check-in ID in my git log?

Currently the only way to view the tfs checkin id is by using the git log command. As any other git users, I have my prettified git log, so I'd like to include the tfs checkin id flag into my git logs. It would also be a plus if there's a flag I…
CincauHangus
  • 431
  • 3
  • 21
2
votes
1 answer

Git-tfs fetch and diff

I've been using git-tfs and been doing git tfs pull all the time. Now I'm trying to find a way to see diff before merging after git tfs fetch and can't find a way. git remote doesn't show a tfs repo as a remote.
iLemming
  • 34,477
  • 60
  • 195
  • 309
2
votes
1 answer

Git tfs without bare repository

I work in a lot of different projects and would like to use git-tfs from several computers without an extra bare repository. My idea is to store the git-tfs repository on a share and do all pushes into a work branch. Merge changes to the master and…
adrianm
  • 14,468
  • 5
  • 55
  • 102
2
votes
1 answer

Simple git-tfs unshelve kicking back "The system cannot find the file specified"

I have quite a bit of work in a TFS shelveset and wanted to switch to using git-tfs. Things started smoothly, but I'm stuck on the error below. Here was my sequence, working from an empty directory. > git-tfs quick-clone…
pettys
  • 2,293
  • 26
  • 38
1
vote
1 answer

git-tfs: Preview changes

Can I preview the changes that will be checked-in to TFS without using git tfs checkintool? I'd prefer a better UI like GitGui and I'd prefer not to risk accidentally clicking Ok.
Brian Low
  • 11,605
  • 4
  • 58
  • 63
1
vote
1 answer

TFVC to Git conversion with git tfs problematic folder

We are using TFVC server workspace repository and there is a problem with too long file names, which causes the conversion to abort:"The following path contains more than the allowed 259 characters". The mentioned folder was a renamed one. Can I…
Patrick
  • 907
  • 9
  • 22
1
vote
2 answers

Go from TFS to Git

I have a client server that has limited rights (no internet or many install priveleges), but it contains a version of TFS. Is there any way possible to get the data and history to bring down to my local computer to put into GIt? I have tried Git-TFS…
cdub
  • 24,555
  • 57
  • 174
  • 303
1
vote
1 answer

Removing large files from TFS cloned git repository

I have been tasked with migrating our Team Foundation Server (TFS) repositories into the agency GitHub Enterprise (GHE) and keeping the entire changelog intact. I am using the git-tfs tool with the following syntax to create a local copy of the…
Paethgoat
  • 13
  • 3
1
vote
1 answer

Migrate code between unrelated repositories

Short Background In our team, we have just migrated to git from TFS (I know!). However, we still have to perform maintenance on the TFS code base, which needs to be merged into the develop branch on git. We have made the decision that the new git…
Csaba Fabian
  • 846
  • 9
  • 19
1
vote
1 answer

TFS to Git migration with git-tfs: how to completely disconnect Git from TFS after migration?

I successfully cloned a TFS repository, but git log still shows HEAD pointing to both master and tfs/default as follows: (HEAD -> master, tfs/default) I already tried the filter-branch command, as well as remove the [tfs], [git-tfs] sections from…
evilmandarine
  • 4,241
  • 4
  • 17
  • 40
1
vote
1 answer

Renormalize git history

I am trying to renormalize the line endings in my git history. I would like to do this, since this repo is created from a tfs repo with git-tfs and there are multiple commits with messed up line endings. Why wouldn't git rebase --root --strategy…
Attila Horváth
  • 562
  • 1
  • 5
  • 16
1
vote
1 answer

Migrate subfolder from TFVC repository to git

I am trying to migrate a single Core subdirectory from a TFVC repository into a git repository. The source is used in multiple projects and the other subdirectories are never used but need to be fetched when cloning the repository. They are also…
Mansoor
  • 2,357
  • 1
  • 17
  • 27