I have a Windows PC with git installed. Whenever I start git bash, it always stands at /c/Users/_user with the master branch as below: user#DESKTOP-VE8378L MINGW64 ~ (master)
I guess it should look like user#DESKTOP-VE8378L MINGW64 ~
I had a look at people around, found out that they don't have (master) at their first start using git bash. I checked git repo at where I stand with git remote -v but there is nothing.
I tried git status but there is also nothing to help.
maybe you created a git repository in your home directory?
Do you have a .git directory in your home?
If that's the case you should move that repository in a different directory, or delete the .git direcotory if it was created by mistake.
I don't know why I cannot add a repository account in Xcode.
Product -- Version
Xcode -- 7.3.1
git -- 2.8.1
OSX -- 10.11.5
screenshot from xcode/preferences/accounts
I found the issue. Under preverences / source control, "enable source control" was not checked. Once checked, I was able to add my GitHub remote repository.
You can connect your project to your repository with git bash like this:
$ cd /your/project/path/
$ git init
$ git remote add origin git#github.com:ali/first_app.git # Or other repo URLs
$ git push -u origin --all # pushes up the repo and it's refs for the first time
$ git push origin --tags # pushes up any tags
Hope be useful.
I have an existing xcode project and repo on Github. I recently added a ReadMe file which was suggested by Github but now I can no longer commit and push changes to Github. I keep getting an out of date message. How do I fix this problem?
I had the same experience of adding README.md with the same error.
If you don't want to git pull, because the remote version in Github is outdated.
You can also force push all local branches using:
$ git push -f origin master
The following commands in the Terminal will push your local Xcode project to remote Github.
cd <drag location folder of project>
git init
git push -f origin master
You need to git pull.
If you're using the command line, navigate to the directory of the repository and run git pull. If you're using another interface, the steps may be a bit different.
When you create a new xcode project, there is a checkbox, which you can check if you want to use a git repository on your mac. I did not check that box, so right now I don't have access to source control resources. How can I start using git with my project?
I think you would just need to setup a local git repository.
Open terminal on your Mac and type the following commands:
cd <DirectoryYourCodeIsIn>
git init
git add .
git commit -m 'initial commit'
Also, restart XCode after this is completed.
We have remote svn repository and we want it to convert to git.
Could you please tell me how is it possible to do it on Windows?
Thank.
Install application on Windows:
Git for Windows.
TortoiseGit
Find out the svn repository URL and copy it
Something like this:
Invoke TortoiseGit Clone dialog
Right click on destination folder, e.g. D:\SVN\ToGit, and Click Git Clone...
Check the From SVN repository checkbox
If you copied the URL first, then invoke the clone dialog, TortoiseGit will get the copied URL from clipboard and paste it into the URL text field for you. So, you don't paste it by yourself. Just have look at it to see if it's correct.
And if you right click on destination folder, TortoiseGit also fill the Directory text field for you. Also, take a look to see if it's what you want.
So, just check the From SVN repository checkbox.
And if the svn repository has the standard layout, say trunk, tags, branches, you don't need to do anything further.
Click the OK button to go
Then, starting to clone a svn repository to git repository.
Something like this:
As you can see, TortoiseGit just properly uses Git for Windows command git svn clone to clone it.
git.exe svn clone "svn://svn.code.sf.net/p/tortoisesvn/code/" "D:\SVN\ToGit\tsvn" -T trunk -b branches -t
So, basically, you can go Git Bash/CMD and re-use that command line, and also get the same result.
NOTE: If you can see the r1, r2, r3..., you can stop the cloning anytime, and resume it later by using the same command line.
Clone a local svn repository
With TortoiseGit 2.4.4+
Just copy the svn local path into URL of Clone dialog. See:
Again, Check the From SVN repository checkbox
Cloning:
TortoiseGit 2.4.4+ will use file:/// protocol to clone a local svn repository.
After you get a git repository, you can commit there. And push the commit back to origin svn repository by using TortoiseGit ->SVN DCommit..., something like svn commit.
As you can see, the command is git svn dcommit.
And if the origin svn repository has some new commit(s) need to update, you can use TortoiseGit ->SVN Rebase to fetch the svn commit and then merge/rebase on the latest commit. Something like svn update.
It uses git svn fetch then uses git rebase to merge/rebase the fetched changes.
For command line, you could just use git svn rebase.
Read Pro Git v2 - Chapter 9 for more information and examples.
You can use git-svn which is a tool that lets you convert svn repositories to git repositories. See the git documentation for more information.
Context:
Remote svn server with HUGE repository of several projects. However I only wanted to migrate one project from SVN to Git
Here's how I did it:
Requirements:
Git Extensions - Git Extensions
Visual SVN Server (also get eval license) - Visual SVN Server
Chocolatey windows package manager - Chocolatey
Git version 2.6.2 (use chocolatey in cmd: choco install git --version 2.6.2 )
What to do:
1. Get users who committed into authors file
Open cmd to root of local svn project copy and run:
svn log -q | awk -F '|' '/^r/ {sub("^ ", "", $2); sub(" $", "", $2); print $2" = "$2" <"$2">"}' | sort -u > authors-transform.txt
Put the resulting authors file somewhere you can find it
Open and Edit the authors-transform.txt file by adding the name and the email into the <> line by line for each committer
2. Copy your SVN repository from the server to a local on your working drive (example: c:/repo/Repository
3. Install Visual SVN and point the storage of the server to the /repo folder
Also find an open port for it to run on
Set permissions on the authentication to windows for the server
You may have to create a user for the server as well
Also set permissions for the specific project within the server to your user
4. In the destination folder for your new cloned SVN repo hold shift and click Git Browse to open Git Extensions, go to Start, and click Clone SVN
Point to the local svn server you created for the destination (example http://localhost/svn/repo/Repository/Development/ProjectName)
I unchecked the trunk, tags, and branches but YMMV
Point the authors file to wherever it is saved
Click clone
Reasons:
Git 2.6.2 because it was the latest version that didn't cause an address issue
Git Extensions because it minimized all the command line work for the cloning
Visual SVN because I was having permissions issues on the server and the "git svn" commands responded better to an http://localhost..... address than the file:// that was suggested in the many places I researched
Chocolatey because I didn't see any other way to get that version of Git
I ended up doing this so much, I made a batch script to help out:
usage: SvnToGit <path/to/svn-repo> <local-checkout-dir> <remote-git-url>
Prerequisites
You should already have the URL to the empty git remote repository.
You should have a pre-existing authors.txt file at the root ready to
go.
Unless Git understands your svn format, you will need to run
svnserve to 'serve' the repo. You can create a window service to do,
something like this:
c:>sc create svnserve binpath="\"svnserve.exe\" --service -r C:\Users\UserName\Repositories\Svn" displayname="Subversion Server" depend=Tcpip start=auto
Caveats:
Check the intermediate results, occasionally something may fail
(especially svn clone).
Note the section for manual changes if needed
for tags. Perhaps, this could be done in batch file, but it seemed
complex and not a high priority for me. There is a PAUSE here, so
you can make these changes manually.
I have not tested this on many systems, you might need to tweak
the script a bit to adjust to your system.
The actual batch file:
REM Argument 1: Path to your repository
REM Argument 2: Path to your new Git working directory
REM Create authors.txt file
REM It will contain lines like:
REM SomeCoder = Some Guy <some.guy#example.com>
REM If Git is now aware of the format of svn repository, you will need to use svnserve:
REM svnserve -d -R --root path/to/your/repository
PAUSE
IF EXIST bare.git\NUL RD /S /Q bare.git
IF EXIST GitTemp\NUL RD /S /Q GitTemp
REM The following will not work, if SVN is using a newer FS than what Git is aware of
REM git svn clone file:///%1 --prefix=svn/ --no-metadata -A authors.txt --stdlayout GitTemp
REM So, use
git svn clone svn://localhost/%1 --prefix=svn/ --no-metadata -A authors.txt --stdlayout GitTemp
PAUSE
REM GitIgnore
cd GitTemp
git svn show-ignore > .gitignore
git add .gitignore
git commit -m "Convert svn:ignore properties to .gitignore."
cd ..
REM Bare Repo
git init --bare bare.git
cd bare.git
git symbolic-ref HEAD refs/heads/trunk
cd ..
cd GitTemp
git remote add bare ../bare.git
git config remote.bare.push 'refs/remotes/*:refs/heads/*'
git push bare master
cd ..
REM clean up SVN type stuff
cd bare.git
REM git branch -m trunk master
git branch -m svn/trunk master
git symbolic-ref HEAD refs/heads/master
cd ..
REM Manual changes if needed for tags
REM git for-each-ref --format='%(refname)' refs/heads/tags |
REM cut -d / -f 4 |
REM while read ref
REM do
REM git tag "$ref" "refs/heads/tags/$ref";
REM git branch -D "tags/$ref";
REM done
PAUSE
REM Working Directory
git clone bare.git %2
cd %2
git checkout master
git remote remove origin
PAUSE
git remote add origin %3
REM Then
git push -u origin master