Git allows you to create patch files that may be email or transfered in other ways the imported into a repository from outside the git chain.
To create a patch file of the last commit
git format-patch -1 gzip 0001-name_of_patch_file.patch
gzip -dc 0001-name_of_patch_file.patch.gz |git apply
In the remote repository you are planing on pushing to, run the following:
git config receive.denycurrentbranch ignore
Then download the Post-update.zip and unzip it. Now copy this file to your .git/hooks/ folder and make it executable.
wget http://wiki.mattrude.com/images/d/de/Post-update.zip unzip Post-update.zip rm -rf Post-update.zip chmod 775 post-update mv post-update .git/hooks/post-update
You should now be able to remotely push to this repository without errors.
From inside your git repository, after you have committed all you changes, run:
git symbolic-ref HEAD refs/heads/name-of-new-branch rm .git/index git clean -fdx
You will now have an empty directory waiting for your first commit.
So if your creating a new branch for github pages for example, you would run:
git symbolic-ref HEAD refs/heads/gh-pages rm -f .git/index git clean -fdx
And your ready to start creating your page.
cgit is fast web interface for the git. cgit has built a cache and is compiled in c so it’s very quick.
To start out, download the current version of cgit via git
git clone git://hjemli.net/pub/git/cgit
Next you need to setup the git submodule
cd cgit git submodule init git submodule update
Once your done, run get-git
make get-git
Then compile the software
make
And install it
make install
After you have installed cgit, you will need to setup Apache to run cgit. This is pretty easy, just edit your /etc/httpd/conf/httpd.conf file and add the following for the site you wish to run cgit on.
<Directory "/var/www/code.mattrude.com/">
AllowOverride None
Options ExecCGI
Order allow,deny
Allow from all
</Directory>
Once your done setting up cgit in Apache, you may configure cgit by creating a cgitrc file at /etc/cgitrc. Below is the example config file.
EXAMPLE CGITRC FILE ------------------- # Enable caching of up to 1000 output entriess cache-size=1000 # Specify some default clone prefixes clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git # Specify the css url css=/css/cgit.css # Show extra links for each repository on the index page enable-index-links=1 # Show number of affected files per commit on the log pages enable-log-filecount=1 # Show number of added/removed lines per commit on the log pages enable-log-linecount=1 # Add a cgit favicon favicon=/favicon.ico # Use a custom logo logo=/img/mylogo.png # Enable statistics per week, month and quarter max-stats=quarter # Set the title and heading of the repository index page root-title=foobar.com git repositories # Set a subheading for the repository index page root-desc=tracking the foobar development # Include some more info about foobar.com on the index page root-readme=/var/www/htdocs/about.html # Allow download of tar.gz, tar.bz2 and zip-files snapshots=tar.gz tar.bz2 zip ## ## List of common mimetypes ## mimetype.git=image/git mimetype.html=text/html mimetype.jpg=image/jpeg mimetype.jpeg=image/jpeg mimetype.pdf=application/pdf mimetype.png=image/png mimetype.svg=image/svg+xml ## ## List of repositories. ## PS: Any repositories listed when section is unset will not be ## displayed under a section heading ## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') ## and included like this: ## include=/etc/cgitrepos ## repo.url=foo repo.path=/pub/git/foo.git repo.desc=the master foo repository repo.owner=fooman@foobar.com repo.readme=info/web/about.html repo.url=bar repo.path=/pub/git/bar.git repo.desc=the bars for your foo repo.owner=barman@foobar.com repo.readme=info/web/about.html # The next repositories will be displayed under the 'extras' heading section=extras repo.url=baz repo.path=/pub/git/baz.git repo.desc=a set of extensions for bar users repo.url=wiz repo.path=/pub/git/wiz.git repo.desc=the wizard of foo # Add some mirrored repositories section=mirrors repo.url=git repo.path=/pub/git/git.git repo.desc=the dscm repo.url=linux repo.path=/pub/git/linux.git repo.desc=the kernel # Disable adhoc downloads of this repo repo.snapshots=0 # Disable line-counts for this repo repo.enable-log-linecount=0# Restrict the max statistics period for this repo repo.max-stats=month
The idea here is to allow anyone to download your GIT repository using the native git protocol. This is similar to the post I wrote about Creating a secure Git repository server, but the below method allows full read only public access to the repositories.
Start out by modifying the new file git-daemon.
vim /etc/xinetd.d/git-daemon
Add the below text to the file.
# description: The git daemon offers anonymous access to git repositories
service git
{
disable = no
type = UNLISTED
port = 9418
socket_type = stream
wait = no
user = git
server = /usr/libexec/git-core/git-daemon
server_args = --inetd --export-all --base-path=/var/git
log_on_failure += USERID
}
You may need to change the location of the git-daemon (the above example is from Fedora) and you will need to update the location of your git repository directory.
The above configuration will share ALL the git repositories in the /var/git directory.
If you do not wish for the all repositories to be public, you may remove the --export-all flag and add a empty file named git-daemon-export-ok to the git repository you wish to still share.
git config --global user.name "Your Name Here" git config --global user.email you@example.com
(Public access)
git clone http://git.example.com/folder/project.git
(From within the projects folder)
git pull
git comment file.txt
git revert ce963c9db00c25b3c1e6add1fe6032aef61a5bed
git commit --amend
git diff file_with_changes > 0001-name_of_patch_file.patch gzip 0001-name_of_patch_file.patch
gzip -dc 0001-name_of_patch_file.patch.gz |patch -p1
git branch <branch>
or to create a branch and switch to it
git checkout -b <branch>
git checkout <branch_committing_to>
Now that your in the branch you want to add the changes to, run:
git pull . <branch_committing_from>
git checkout <branch>
git branch -d <branch>
git push origin :<branch>
git push <remote_repository_name> <branch_name>
So that would be…
git push origin <branch>
git remote show origin
git checkout --track -b <name_of_local_branch> origin/<name_of_remote_branch>
git tag -a -m "tagging version 1.0" 1.0
git push --tags
git tag -d 1.0
git push origin :refs/tags/1.0
git pull git submodule init git submodule update
git submodule add <remote-host>:<project.git> <project.git>
So if you are adding project “program” from the example git server you will run
git submodule add git://example.com/program.git program
On the Server create the git repository
mkdir name-of-git-repo.git cd name-of-git-repo.git git init --bare
On the Client System create the git repo to import into the server
git init touch README git add README git commit -m 'first commit' git remote add origin git@REMOTE_SERVER:name-of-git-repo.git git push origin master
To import a svn repo create a new git repo and run
git svn clone https://svn.foo.com/svn/proj git commit
Running a secure git repository on FreeNAS is pretty straight forward, once you understand what your trying to do. If you have looked over my previous post “Creating a secure Git repository server” you understand that all you really need to do is connect to the git repository via ssh/ssl and copy back what you need. The hardest part of using FreeNAS is creating the keys.
To start out, you need to create a user account on the FreeNAS system. This will be a generic account that everyone who has write access will use. You may also create a account for each person, and grant each of them access to the central repository.
After you have your account, follow my post on “Enable SSH Key Authorization on FreeNAS” to copy over the SSL key and setup the account. Once you are able to log in as your FreeNAS git user, you may follow my previous post “Creating a secure Git repository server” to setup the git repository.
Creating a secure git repository server is a pretty simple process. Basically we will be using SSH to transmit the data over an encrypted channel. SSH will handle all the authentication and data encryption. So the first set is creating a user for git to use and creating the git users ssh key.
On your server, from a privileged account, create a user (were going to use git).
adduser git passwd git
The configuration we will be setting up will store the actual repositories in the git users home directory. If you don’t like it’s current location, you may modify the /etc/passwd file for your user.
Once we have the user setup, in it’s home directory we need to create our first repository. Start out by creating the folder, then well go into it and create the git repository files.
mkdir new-project.git cd new-project.git git init --bare
With the repository now setup go back to your desktop/laptop system (linux/unix).
From your desktop system, create a empty repository or go to an existing git repo. If you are going to be adding an existing repo, it may not be connected to any other remote repository. if you clone it from a remote source (a directory on the same system counts as a remote source) you will need to modify the repository’s config file and remove those entry’s, look in the config file under the .git (note the ‘dot’) directory.
To create an empty repository, create a directory for the repository, go into it and init the repo.
mkdir new-project.git cd new-project.git git init
Since you need something in your repo, and git likes having a readme file (or gitweb dose) let’s create a readme file and commit it.
touch README git add README git commit -m 'Added README file, first commit'
Now that we have a commit in our repo, we can add the newly created git repo server and push our new repo to it.
We will start by adding the server to the repo’s configuration.
git remote add origin git@new-git-server.example.com:new-project.git
The above example assumes you’re server’s name is “new-git-server.example.com” and your using a project named “new-project.git” for the user “git”. But it also assumes that your repo is directly in the user git’s home directory. If you store your repo’s in a different directory, you will need to add the list folders after the colon.
After you have successfully added the server, push your new repository to the server.
git push origin master
You may now be asked for the git user’s password, enter it, and your repository should be transferred.
Also check out how to setup a ssh public/private key where no password is required, only the private key on your client system.
The above may look like a lot, but it’s really pretty simple to setup. If you have any problems or questions abut this How-To, please leave a comment or contact me.