Git server for Windows | GitStack

GitStack 2.3.1 released

poiuytrez (staff) — Fri, 08 Mar 2013 14:14:23 +0000

We are glad to announce the release of GitStack 2.3.1.

GitStack 2.3 runs on :
-Git 1.8.2 from msysgit
-Apache 2.2.22
-Python 2.7.2
-Django 1.4

New features:
-Git 1.8.0 upgraded to 1.8.2

GitStack 2.3 released

poiuytrez (staff) — Fri, 30 Nov 2012 13:09:13 +0000

We are glad to announce the release of GitStack 2.3.

GitStack 2.3 runs on :
-Git 1.8.0 from msysgit
-Apache 2.2.22
-Python 2.7.2
-Django 1.4

New features:
-Git 1.7.11 upgraded to 1.8.0

Bug fixes:
-Apache return error 500 when authentification by LDAP secure port (issue #140)
-Authorization for webview does not work if https is enabled (issue #138)
-Config refreshed after an update of the ldap bind account (issue #137)
-Cannot add an allowed user when the license limit is reached (issue #134)

How to migrate from TFS to Git

poiuytrez (staff) — Thu, 11 Oct 2012 12:50:05 +0000

Team Foundation Server or TFS as it is popularly known, is Microsoft’s answer to revision control software especially the popular Linux-derived versions of such software such as Git. As with over versions of software from Redmond, there are a variety of complaints popularly associated with TFS which lead to software developers and teams wanting to migrate from this revision control software option to other options that offer them better advantages depending on their particular situation. Some developers simply want to be able to work with both TFS and other revision control software tools like Git.

Git, is a distributed revision control and source code management system initially developed by Linux founder Linus Torvalds for the Linux operating system. When people who have tried to work with TFS decide they can no longer do so or want to combine options, Git is usually one of the first options they consider. Several advantages are associated with this software, the first of these advantages being that it is free, can be installed on an internal server like GitStack or used with public or collective repositories that depend on it for their infrastructure such as GitHub.

The Git option is so popular that Microsoft in 2012 announced TFS integration with Git in order to curtail the migration yearnings of people bored with the TFS option. The integration solution known as Git-tf, allows users to work with Git repo – branch, commit, edit, commit, branch, merge as well as other options and then move the content to be shared or stored on a TFS repository. The logic of Git-tf is one-sided and aims to move Git aficionados over to Microsoft’s TFS, although Microsoft actually does claim it is in order to support teams that are known to work with both solutions.

Git-Tf – Supports Git to TFS Migration or Integration

For those who beg to differ and insist on TFS to Git migration, perhaps not as a means of abandoning the Microsoft solution but also to share their work with people who work with Git as a central revision control system instead, Git has several options typically called Git/TFS bridges, which are primarily developed by members of the open source community versus typical Redmond solutions developed by individuals paid to do so.

The most popular TFS to Git migration option is a plug-in similarly named to the Microsoft solution called Git-tfs. It came on scene in 2009 and has undergone several revisions in alignment with the changes that frequently occur with the TFS software and also to ensure consistent cross-compatibility. Git-tfs is a two-way solution; it helps people move from TFS to Git and vice-versa.

1. Installation

The most important thing you need to begin is to have your own version of Git installed or if you have it on a central repository, that’s equally fine as well. After this you’ll have to download Git-tfs, you have a variety of locations to choose from. The most reliable download location is the plug-in repository on GitHub where you can download the zip files from and install the software on your Windows system. If you download the Git-tfs source code instead of the executable, you will need to compile it using the Visual Studio SDK, which you should already have on your system. There is an exe version as well but note that it will not run if the .NET framework is not installed on your system, the same applies for the source code.

2. Clone Your TFS version

Once Git-tfs is successfully installed you can copy your source code from TFS by taking advantage of the “git tfs clone” command option as shown below:
git tfs clone http://tfs:8080 $/TeamProject/git_folder
If you’re using the TFS version 2010 or later, you might want to use the following command:
git tfs clone http://tfs:8080/tfs/DefaultCollection $/TeamProject/git_folder
For those who don’t use default credentials, you will need to use the – –username option:
git tfs clone — –username tfs\tfssetup http://tfs:8080/tfs/DefaultCollection $/TeamProject/git_folder

A dialog box should show up so you enter your password when the command is about to execute. Make sure that the folder you are copying the Git source code to is different from where you do your TFS work. The end-result should be two versions of source code one which is TFS and the other Git.

3. Solution File Problems

Of course there’s the annoying issue of solution files that connect to TFS once the solution is opened. The easy way of handling this problem is to disconnect from the Internet once the solution is opened forcing it to open in offline mode via the browser. The solution will then open normally, after this you can reconnect to the Internet. Alternatively you can always opt for the tedious option of removing the source code links. The final option is to install the GoOffline solution from Microsoft. It’s a free Visual Studio add-in which places a Go Offline button in the Source Control menu. Once the solution is in offline mode, any file renaming or moving happens without a need to communicate with the TFS server.

GoOffline Add-In

4. Shelving Changes

Once your changes have been made and your latest update to your code on the Git repository is committed to memory, you can update the TFS version of the code by using the shelveset technique. The way this works is that all local changes you make are aggregated into a shelveset and placed on the server. This way you don’t need to worry about rewriting local history or having multiple shelvesets on the server that you would have to process in chronological order.

Changes can now be made using the “git tfs shelve” command like this:
git nfs shelve “shelveset name”

Once this is done, move over to the TFS version and go to the “Pending Changes” window where you can unshelve the new shelveset. If everything is perfect revert to the regular TFS check in with the associated policies used.

5. TFS to Git Update

The above listed shelving changes apply when you are updating from Git to TFS. When you want to work on TFS and update your Git repository, the command required is “git tfs fetch” which collects the latest changes in tagged objects format from the relevant server although they changesets won’t be applied automatically. To apply them you need to use the ”git merge” command which applies the tagged object changesets to your Git repository.

git tfs fetch -i $/TeamProject/Branch/Component
git merge tfs/$/TeamProject/Branch/Component

Conclusion

Git-tfs is an effective tool for not only migrating from TFS to Git but interfacing between both revision control systems effectively. The plug-in versions available from the developer Matt Burke, change frequently to cope with TFS changes, so make sure that before use, the version of Git-tfs you have is up to date. However, should any concerns or problems arise, multiple sources of information are available on the Internet which cater to users of this resource. The GitStack’s team can also provide you an additional technical support during your migration process.

GitStack 2.2.4 released

poiuytrez (staff) — Thu, 20 Sep 2012 14:55:35 +0000

We are glad to announce the release of GitStack 2.2.4.

GitStack 2.2.4 runs on :
-Git 1.7.11 from msysgit
-Apache 2.2.22
-Python 2.7.2
-Django 1.4

Bug fixes:
-Licensing issues (issue 132)
-Installer check for port 80 (issue 93)

GitStack 2.2.3 released

poiuytrez (staff) — Tue, 21 Aug 2012 12:34:11 +0000

We are glad to announce the release of GitStack 2.2.3.

GitStack 2.2.3 runs on :
-Git 1.7.11 from msysgit
-Apache 2.2.22
-Python 2.7.2
-Django 1.4

Bug fixes:
-Anonymous push security fix (issue 123)
-Repository case security fix (issue 121)

Free Git e-book

poiuytrez (staff) — Fri, 17 Aug 2012 15:13:13 +0000

Our Syncfusion partner has published a comprehensive guide to using the Git repository earlier this year. The “Git Succinctly” ebook will have you up and running with one of the fastest-spreading revision control systems out there.
Git Succintly is complete with vivid diagrams, clear code samples, and a careful walk-through of primary features; it’s your guide to how Git operates, what its advantages are, and how you can incorporate it into your own workflow.

Git Succinctly will teach you:

-How to install and configure Git.
-How to create and clone repositories.
-How to use the staging area to organize and manage your commits.
-How to create, manage, and merge branches.
-How to interact with remote repositories.

Get it now!

We recommend to distribute this ebook to your developers after a GitStack deployment.

GitStack 2.2.2 released

poiuytrez (staff) — Tue, 31 Jul 2012 11:39:34 +0000

We are glad to announce the release of GitStack 2.2.2.

GitStack 2.2.1 runs on :
-Git 1.7.11 from msysgit
-Apache 2.2.22
-Python 2.7.2
-Django 1.4

Bug fixes:
-UI fixes (issue 122)

GitStack 2.2.1 released

poiuytrez (staff) — Wed, 25 Jul 2012 11:14:55 +0000

We are glad to announce the release of GitStack 2.2.1.

GitStack 2.2.1 runs on :
-Git 1.7.11 from msysgit
-Apache 2.2.22
-Python 2.7.2
-Django 1.4

Bug fixes:
-User permissions display add twice the users (issue 119)
-Group permissions does not work to browse repositories (issue 117)
-License error when using groups (issue 116)

GitStack 2.2 released

poiuytrez (staff) — Mon, 16 Jul 2012 13:09:04 +0000

We are glad to announce the release of GitStack 2.2.

GitStack 2.2 runs on :
-Git 1.7.11 from msysgit
-Apache 2.2.22
-Python 2.7.2
-Django 1.4

New features:
-Git 1.7.10 upgraded to 1.7.11
-User filter box when adding a new user to a repository
Bug fixes:
-30 days trial issue
-Update kills admin password (issue 111)
-Repository panel performance improvements (issue 108)
-Ldap credentials exposed (issue 107)
-Repository web browsing password more explicit (issue 106)

Best git clients on windows

poiuytrez (staff) — Tue, 03 Jul 2012 14:33:37 +0000

Top 5 of all time

MsysGit

http://msysgit.github.com/

This is the most flexible, most hacker points way to use git, but chances are if you are the type of person to do it, you could tell us twelve more awesome things that are possible.

While it’s aimed at power users, quite a lot of effort has been put in to make git more user friendly, with recommendations when you get commands slightly wrong and fairly informative errors.

Highly recommended to use and know well if you aim to do any remote work (ie; via ssh) using git, or any tasks involving automation (say, a mirroring your svn to git), it’s the first choice to make.

Msysgit is a handy little packaging of the git toolset in a cygwin environment. You’ll find yourself stepping out of the typical windows command prompt and into cygwin for every little task, you’ll type ‘ls’ instead of ‘dir’ 9 times out of 10 – and you’ll feel right at home using git in this fashion. Pain points will include ssh keys (you have to get your hands dirty with putty/pagaent, as with many things involving ssh keys on windows), and if you don’t have your merge tool (TortoiseMerge is highly recommended) available, it’s back to manual merging.

Msysgit will help you to debug your git environment by providing a similar set of features as the linux git client.

Eclipse team provider (E-Git)

E-Git. It’s the Eclipse team provider. It’s another fancy it just works solution. Or the first mentioned in this article – take your pick.

If you know how to fly the eclipse market, it’s a snap to get your hands on it. The user experience is just what you’d expect from an IDE solution – it’s a slick experience.

Working with a cloned repo is a breeze, offering a fairly easily understood experience. Of interest, revert via compare isn’t typically offered by other clients, who focus strongly on ‘revert via reset’.

The biggest hassle with be configuring repos if you are used to just typing a remote + refspec; being something you have to do at the very start of your projects.

Other than that minor wrinkle, it’s all fairly straight forward.

One thing to check carefully – does the merging allow you to avoid fast forward merges? A look at the user interface doesn’t really make this clear, and if you need to work without fast forward mering this may be a deal breaker.

Be sure to check out the tutorials for more – http://unicase.blogspot.com.au/2011/01/egit-tutorial-for-beginners.html

NetBeans 7.1+

http://netbeans.org/kb/docs/ide/git.html
If you are looking for an enterprise focused PHP IDE, NetBeans is probably on the shortlist. As of version 7.1 it provides all of the git bells and whistles you can eat.

Kids, don’t take that previous statement as an enticement to eat whistles now.

All of the functionality you’d expect is there, and a bit more – setting up private keys is a snap. The integration with the rest of the IDE is top notch and quite comparable to any other source control provider.

Having used TortoiseSVN & family previously, the only fault I have for it is the commit, and merge dialogs – everything else looks nice, but these seem to have fallen down the functionally ugly tree.

When that’s the worst thing you can say about a tool, that’s not too shabby.

TortoiseGit

http://code.google.com/p/tortoisegit/

The first time I used TortoiseGit, it was version 0.3.3. It certainly didn’t impress in the same way that TortoiseSVN did – the underlying model of git was new to me, no ah hah moments were forthcoming. I quickly found myself at a loss and gave up.

Today I’m more than happy to eat my words. Though you need to install mysisgit before hand (and it can be a little confusing to find exactly the right executable to install), TortoiseGit has achieved a parity of usability with TortoiseSVN – the two will happily co-exist in your toolset.

Why TortoiseGit? I offer you simply this picture:
Seamless integration of the most important git commands, and everything else you could possibly ever want as well right in your window environment – no further than a right click away at all times.

If you use text editors more than IDEs, this is the way to go. Viewing logs, committing, pushing and pulling are all clean, easy experiences – the shared heritage with TortoiseSVN shows through strongly.

Weaknesses include the reliance on mysisgit to set up first, and issue tracker integration can be a bit hit and miss depending on the approach you take via plugins.

Git for IntelliJ

http://www.jetbrains.com/idea/features/version_control.html

Supported out of the box with IntelliJ, git integration is on an equal footing with the Eclipse and Java offerings.

About the Author

Daniel O’Connor is an Architect, Software Developer and enthusiastic Open Source contributor.

His experience stems from over 7 years of web oriented and enterprise development, working collaboratively with teams located in Australia, New Zealand, Manila, the US & Europe for financial, mortgage and real estate industry clients, as well as deep involvement with a number of Open Source projects.