I want to use git as a local repository against a remote SVN repository. I installed version 1.6.0.2 from http://code.google.com/p/msysgit/downloads/list.
According to the documentation synchronization is done via the command
git svn
or a separate command wrapper called
git-svn
Neither of them is available in my installation and I could not find a separate download for Windows binaries.
I'm currenty using the MSYS build. Must I switch to cygwin?
git-svn is installed in the latest version of msysgit. However, there's a slight caveat: while git-svn shows up in C:\Program Files\git\libexec as "git-svn", svn is actually called as an argument to the git executable, thus:
git svn clone http://example.com/svn/repo/
This earlier version has working git-svn. I thought that git-svn in the current version that you installed was fixed, but maybe not. Git-svn definitely did not work in the windows version of Git 1.5.6.1.
Install cygwin and select the git-svn package under the Devel category.
The git svn command is written in Perl and requires the Subversion Perl libraries. The existence of the svn command line command is insufficient for git-svn.
I haven't used git svn on Windows (only on Unix and Mac OS X), so I can't really provide more detail, but hopefully this should point you in the right direction.
I don't know git, but I know that for Mercurial, for example, you have to have SVN installed to convert from SVN to Mercurial (and back). Perhaps it is the same for git?
SVN is quite big by itself, so perhaps concurrent systems won't want to distribute it with their software, bloating the download.
I used the command line SVN client from Slik SVN, not too big and installing cleanly.
Of course, wait for more informed answer, or search the Web for confirmation of my information... :-) Although it doesn't hurt to have an SVN client, since lot of projects use it.
Related
On my Windows 8.1 PCs I have VS 2013, which has its own Git stuff baked into it. Per the "suggestion" made by the VS IDE, I installed the Git command line tools (the full Git package). This got me version 1.8.3.msysgit.0. Then I installed GitHub for Windows, which installs its own "local" version of Git (on my PC it's version 1.8.4.msysgit.0).
So now I effectively have 3 different versions of Git on my PC:
The equivalent version baked into VS 2013 (if I ask it to perform Git operations for me)
The 1.8.3 version I manually installed, with nifty Whindows shell integration so I can click on a file or folder in a repo and bring up git gui or git bash for that repo.
The 1.8.4 version baked into GitHub for Windows
And, I would assume that these Git versions will change over time as I install updates to these tools.
My question is: As I use these three different tools to fiddle with my repo, am I at risk of them not agreeing on the repo internal structure?
I just can't wrap my brain around the fact that my Windows box doesn't have a unique, single installation of Git that all three tools use. Rather, each tool has its own concept of the Git version, but I'm using all three tools on the same repository.
As I use these three different tools to fiddle with my repo, am I at risk of them not
agreeing on the repo internal structure?
No. The main internal structure (pack format) won't change so much it would become incompatible with older git 1.8 versions.
And you can have as many different version of Git on your computer: they are portable archives, that you can unzip anywhere.
The only limitation is in term of feature (like for instance, pushing to shallow repo, which is only possible since git 1.9.0)
I have Windows 8.1 on my laptop and I've installed Git. If I type git --version in Windows' command prompt, the result is git version 1.8.5.2.msysgit.0. I can commit and update all the stuff on the server, everything works fine.
At the same time, I'd like to have a GUI for that so I've installed GitHub for Windows. Unfortunately, it does not let me commit my changes as it report that there is an error as suggests opening a shell (also console-like, but looks different from usual Windows' cmd). If I type in that shell git --version I get git version 1.8.4.msysgit.0 so apparently the GUI app uses an older version of git than the one I need, although I have a needed version of Git installed on my computer.
I appreciate any hints on how to make the GUI app to use the new version of git. If any details are still needed, please tell me - I'll provide them asap. Thanks
You will find the git (embedded in G4W -- GitHub for Windows as SLaks mentions) in
%LOCALAPPDATA%\GitHub\Portable_Git_xxxxx\
(See "Can the credentials stored in Github for Windows be shared with the whole operating system?")
You can try and replace that folder by a portable Git, PortableGit-1.8.5.2-preview20131230.7z: once uncompressed, you can rename the folder with the same name 'Portable_Git_xxxxx' and see if that works.
I am having trouble determining the difference between MSysGit and Git for Windows. How are they different? Why would I choose one over the other?
Are they not the same thing?
On: http://msysgit.github.com/ The title is Git for Windows, the application is msysgit.
Even in the event they are not, I expect the only differences will be in the method of compilation (i.e. compiler used and any options set) and any extraneous packaging (such as having a bash emulating shell as in msysgit). The actual product (Git itself) should remain broadly similar.
Edit: Thanks to Jarrod for pointing this out. I've left the above in for posterity. To quote the wiki:
msysGit is the development environment
to compile Git for Windows. It is
complete, in the sense that you just
need to install msysGit, and then you
can build Git. Without installing any
3rd-party software.
msysGit is not Git for Windows; that
is an installer which installs Git --
and only Git.
It is easy to see the difference: the
installers for Git have the prefix
Git-, the msysGit installers have the
prefix msysGit-. Another telltale is
that the msysGit installers come in
two flavors: fullinstall and
netinstall. Further, msysGit does not
install to C:\Program Files by
default. But msysGit comes with gcc,
the GNU C Compiler.
So, the difference between the two projects:
msysGit is the msys+mingw environment + everything needed to compile Git yourself, on Windows.
Git for Windows is exactly that: Git, compiled for Windows.
(Now) they are the same (as of May 2015 but likely a bit earlier):
"msysgit" and "Git for Windows" have merged under the name "Git for Windows." msysgit.github.io now hosts "Git for Windows" and the main git download site git-scm.com lists msysgit.github.io as the maintained build for windows.
From the updated wiki:
... we decided to just phase out the name "msysGit" (as well as the GitHub org of the same name) and work on Git for Windows (with the corresponding GitHub org, and using the name "Git for Windows" for the installer aimed at "end-users" and "Git for Windows SDK" for the development environment targeting Git for Windows developers).
Here is the excerpt 'Official README'
"portable" version of Git for Windows (MSysGit) does not need tobe installed. It will run from any directory you place it in, evenonto a USB thumbdrive. It will not write permanent entries into the Windows registry. It does not need administrator privileges to "install". This version does not offer you the convenient right-click context menu entries "Git GUI Here" and "Git Bash Here", because these would require to add entries into the Windows registry.
Git for Windows is newer than msysGit. If you want to use Git version 2.x you need to download from https://github.com/git-for-windows/git/releases. https://github.com/msysgit/git/releases is used for Git version 1.x.
Some technical details from https://github.com/git-for-windows/git/wiki/FAQ
Git for Windows used to be developed using the development environment called "msysGit", but roughly coinciding with Git 2.1, msysGit was superseded by a new development environment: the Git for Windows SDK.
As many answers in this post are old.
As on Nov 2015,
msysGit-based Git for Windows 1.x is now superseded by Git for Windows 2.x.
Git for Windows and git-scm both points to same download location for their binary
Download Location:
https://github.com/git-for-windows/git/releases/download/v2.7.1.windows.2/Git-2.7.1.2-64-bit.exe
The titles on the download page have just been updated so that the "Git for Windows" versions are fully identified. There is now both an 'installed' version (with right click menu options), and a Portable version that runs direct from a memory stick etc.
From what I understand Git on Windows is the project consisting of the four bulletpoints below.
Taken directly from https://github.com/msysgit/msysgit/wiki:
Git on Windows
To make the milky 'soup' of project names more clear, we say like this:
msysGit - is the name of this project, a build environment for Git
for Windows, which releases the official binaries
MinGW - is a minimalist development environment for native Microsoft Windows applications.
MSYS - is a Bourne Shell command line interpreter system, is used by MinGW (and others), was forked in the past from Cygwin
Cygwin - a Linux like environment, which was used in the past to build Git for Windows, nowadays has no relation to msysGit
This is a more clear general comparison right from their site https://github.com/msysgit/msysgit
Git for Windows is the software package that installs a minimal environment to run Git on Windows. It comes with a Bash (a Unix-type shell), with a Perl interpreter and with the Git executable and its dependencies.
On the other hand, msysGit is the software package installing the build environment that can build Git for Windows. The easiest way is to install it via the net installer.
Git for Windows is probably what you want. It includes the following primary features:
Git BASH Git for Windows provides a BASH emulation used to run Git
from the command line. *NIX users should feel right at home, as the
BASH emulation behaves just like the "git" command in LINUX and UNIX
environments.
Git GUI As Windows users commonly expect graphical user
interfaces, Git for Windows also provides the Git GUI, a powerful
alternative to Git BASH, offering a graphical version of just about
every Git command line function, as well as comprehensive visual diff
tools.
Shell Integration Simply right-click on a folder in Windows
Explorer to access the BASH or GUI. The Git-Cheetah plugin also
provides a TortoiseSVN-like interface that displays Git functions
directly on the context menu.
The following is available as a separate download from the same page...
msysGit is a build environment that includes all the tools necessary for developers who want to contribute by writing code for Git for Windows.
Git BASH delivers a familiar environment for Linux experts who occasionally need to use a Windows machine -- even if they don't need git itself. It starts with the BASH prompt and adds a collection of core utility programs such as ssh, find, grep, vi, awk, and of course git.
I'm comfortable using git, and I prefer it very much over CVS. Unfortunately, in our company, we have to use CVS as a version control system. I was wondering if there was anyway to use git locally while committing to the CVS repo, and I was elated when I found this SO question. Unfortunately, it does not seem to work on Windows. I have Git For Windows (mysysgit) installed on my computer, and when I type git cvs or git cvsimport in the terminal it says "not a git command". Is there anyway I can use this functionality on windows?
Use Cygwin git instead of msysgit, it has this and other functions, like git daemon.
Or you can implement this feature and contribute it to msysgit.
I make that methodology work on Windows, but since our CVS server is Linux I do my export to CVS on that server, and then clone to my Windows machine. I push back through a staging repository also located on the Linux server.
I like TortoiseSVN's Windows integration. Is there something like that for dealing with git-svn? I'd even go with a less integrated GUI if it is quick enough to access. What I don't want is a CLI as I rarely would have a command prompt sitting in the correct directory.
This is a related question but for Linux
TortoiseGit (https://tortoisegit.org/) added basic support for git-svn in release 0.8.1.0:
The release log says:
Add Basic Git-SVN Operation:
Add SVN DCommit Command
Add "SVN Rebase" and "SVN DCommit"
command at shell contextmenu
Support Git svn-clone at clone
dialog.
Have a look at TortoiseGit which is a TortoiseSVN clone for Git.
The easiest way I found was to use the git gui, and add a git svn dcommit and git svn rebase command to the Tools menu.
If you install msysGit, it will even put a 'Git GUI here' command in your context menu.
This has the advantage of not requiring any additional software apart from git itself, and will work on every platform that git (gui) runs on.
Edit: I should mention that this is exactly the way I have been productively using git against our svn-repos for a few months now. Works just fine. And it's the same on Windows, Linux, whatever. So no need to use different tools for the same job, depending on the OS.
Try SmartGit , it has almost all the functions console has and it has great GUI. http://www.syntevo.com/index.html
A sideways and very late answer, but maybe useful to later spectators, re why you don't want a CLI; assuming you're using XP install the Microsoft Command Prompt Here Powertoy which gives you an Explorer right-click shortcut on a folder. I use it all the time.
Windows 7 has the feature out of the box, but you have to hold down some key while you right click, I think.. shift or alt or something.
Also, Tortoisegit now apparently has git-svn features, I am going to check them out..
The best GUI tool for for using git local and svn as a server is SmartGitHg from syntevo (works for Windows, Lunux and OS X). For OS X you cal also use SourceTree from Atlassian. Windows Version of SourceTree doesn't support SVN.
You can use TortoiseSVN itself. That's what I do.
One may use any Git client while using the server-side Git-SVN synchronization setup. Have a look at SubGit to achieve that.
One has to install SubGit into Subversion repository:
$ subgit configure $SVN_REPOS
# Adjust $SVN_REPOS/conf/subgit.conf to specify your branches and tags
# Adjust $SVN_REPOS/conf/authors.txt to specify git & svn authors mapping
$ subgit install $SVN_REPOS
...
$ INSTALLATION SUCCESSFUL
SubGit converts Subversion repository into Git (it works in opposite direction as well) and installs SVN and Git hooks. These hooks are triggered by svn commit and git push as result all incoming modifications are instantly replicated to Git or SVN correspondingly. For more details please refer to SubGit documentation and git-svn comparison.
Starting from version 2.0 (not yet released at the moment of posting) SubGit allows to synchronized Subversion and Git repositories located on different hosts.
SubGit is a commercial tool. It is free for open-source, academic and small projects (up to 10 committers).
Full disclosure: I'm one of SubGit developers.
I have not seen best tool in past related to SVN like gui, but Git has now made something very useful and easy try Git Desktop for windows:
https://desktop.github.com/