安装git
查看:
[root@bogon tmp]# rpm -qa |grep -i git
安装:
[root@bogon tmp]# rpm -ivh git-1.7.3-1.fc11.i386.rpm
error: Failed dependencies:
libcrypto.so.8 is needed by git-1.7.3-1.fc11.i386
libcurl.so.4 is needed by git-1.7.3-1.fc11.i386
libexpat.so.1 is needed by git-1.7.3-1.fc11.i386
libssl.so.8 is needed by git-1.7.3-1.fc11.i386
perl(Git) is needed by git-1.7.3-1.fc11.i386
perl-Git = 1.7.3-1.fc11 is needed by git-1.7.3-1.fc11.i386
[root@bogon tmp]# rpm -ivh git-1.6.5-1.fc9.i386.rpm
error: Failed dependencies:
libcrypto.so.7 is needed by git-1.6.5-1.fc9.i386
libcurl.so.4 is needed by git-1.6.5-1.fc9.i386
libexpat.so.1 is needed by git-1.6.5-1.fc9.i386
libssl.so.7 is needed by git-1.6.5-1.fc9.i386
perl(Git) is needed by git-1.6.5-1.fc9.i386
perl-Git = 1.6.5-1.fc9 is needed by git-1.6.5-1.fc9.i386
参考:http://blog.csdn.net/plo154100/archive/2010/08/16/5816831.aspx
依赖包:
openssl-0.9.8k-1.fc11.i686.rpm
perl-git
perl-git与git互相依赖,需同时安装。
[root@bogon tmp]# mount /dev/cdrom /mnt; cd /mnt/Server
mount: block device /dev/cdrom is write-protected, mounting read-only
[root@bogon Server]# rpm -qa |grep openssl
openssl-0.9.8b-8.3.el5
openssl-devel-0.9.8b-8.3.el5
搜索 libssl.so openssl-0.9.8b-8.3.el5
openssl-0.9.8b-8.3.el5=>libssl.so.6
安装较低版本git:
[root@bogon tmp]# rpm -ivh git-1.5.6.1-1.i386.rpm
error: Failed dependencies:
perl(Git) is needed by git-1.5.6.1-1.i386
perl-Git = 1.5.6.1-1 is needed by git-1.5.6.1-1.i386
[root@bogon Server]# rpm -ivh perl-5.8.8-10.i386.rpm
perl-Git-1.5.6.1-1.i386.rpm
==========================================================================
Installing git on Red Hat Enterprise Linux
查看版本信息:
[root@bogon tmp]# lsb_release -a
[root@bogon tmp]# uname -a
[root@bogon tmp]# cat /proc/version
[root@bogon tmp]# rpm -qa |grep -i git
安装依赖包:
[root@bogon tmp]# mount /dev/cdrom /mnt; cd /mnt/Server
[root@bogon Server]# rpm -ivh zlib-devel gettext-devel openssl-devel curl-devel expat-devel
[root@bogon Server]# rpm -q zlib-devel gettext-devel openssl-devel curl-devel expat-devel
zlib-devel-1.2.3-3
gettext-devel-0.14.6-4.el5
openssl-devel-0.9.8b-8.3.el5
curl-devel-7.15.5-2.el5
expat-devel-1.95.8-8.2.1
下载解压缩git:
http://kernel.org/pub/software/scm/git/git-1.7.2.tar.gz
[root@bogon tmp]# tar zxvf git-1.7.2.tar.gz
编译安装:
[root@bogon tmp]# cd git-1.7.2
[root@bogon git-1.7.2]# ./configure
[root@bogon git-1.7.2]# make prefix=/usr/local all
[root@bogon git-1.7.2]# make prefix=/usr/local install
查看安装好的文件:
[root@bogon git-1.7.2]# ll /usr/local/bin/
执行git命令:
[root@bogon git-1.7.2]# git
usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
[-p|--paginate|--no-pager] [--no-replace-objects]
[--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
[-c name=value
[--help] COMMAND [ARGS]
The most commonly used git commands are:
add Add file contents to the index
bisect Find by binary search the change that introduced a bug
branch List, create, or delete branches
checkout Checkout a branch or paths to the working tree
clone Clone a repository into a new directory
commit Record changes to the repository
diff Show changes between commits, commit and working tree, etc
fetch Download objects and refs from another repository
grep Print lines matching a pattern
init Create an empty git repository or reinitialize an existing one
log Show commit logs
merge Join two or more development histories together
mv Move or rename a file, a directory, or a symlink
pull Fetch from and merge with another repository or a local branch
push Update remote refs along with associated objects
rebase Forward-port local commits to the updated upstream head
reset Reset current HEAD to the specified state
rm Remove files from the working tree and from the index
show Show various types of objects
status Show the working tree status
tag Create, list, delete or verify a tag object signed with GPG
See 'git help COMMAND' for more information on a specific command.
===============================================================================
使用 Gitosis 管理 Git 服務器
安装python的setup tool:
http://pypi.python.org/packages/2.4/s/setuptools/setuptools-0.6c11-py2.4.egg#md5=bd639f9b0eac4c42497034dec2ec0c2b
# sh setuptools-0.6c11-py2.4.egg
Processing setuptools-0.6c11-py2.4.egg
creating /usr/lib/python2.4/site-packages/setuptools-0.6c11-py2.4.egg
Extracting setuptools-0.6c11-py2.4.egg to /usr/lib/python2.4/site-packages
Adding setuptools 0.6c11 to easy-install.pth file
Installing easy_install script to /usr/bin
Installing easy_install-2.4 script to /usr/bin
Installed /usr/lib/python2.4/site-packages/setuptools-0.6c11-py2.4.egg
Processing dependencies for setuptools==0.6c11
Finished processing dependencies for setuptools==0.6c11
安装gitosis
https://github.com/res0nat0r/gitosis/downloads
# git --version
git version 1.7.6.4
# unzip res0nat0r-gitosis-2cf6458.zip
# mv res0nat0r-gitosis-2cf6458 gitosis
# cd gitosis
# python setup.py install
Using /usr/lib/python2.4/site-packages/setuptools-0.6c11-py2.4.egg
Finished processing dependencies for gitosis==0.2
在本地开发机器上生成公共密钥(用来初始化gitosis)
執行 Git Bash
$ ssh-keygen -t rsa #不需要密码,一路回车就行
$ scp ~/.ssh/id_rsa.pub [email protected]:/tmp/ # 上传本地的ssh public key到服务器
初始化gitosis
# adduser oracle
# su - oracle # 切换倒git用户下
$ gitosis-init < /tmp/id_dsa.pub
$ chmod 755 ~/repositories/gitosis-admin.git/hooks/post-update
获取并配置gitosis-admin:
執行 Git Bash
$ cd d:\pb10\GCMS
$ git clone [email protected]:gitosis-admin.git # 在本地执行,获取gitosis管理项目
$ vi gitosis-admin/gitosis.conf # 编辑gitosis-admin配置文件
[gitosis]
[group gitosis-admin]
writable = gitosis-admin test gcms
members = whz@C03000450100
[group myteam]
members = whz@C03000450100
writable = test
每个group是一个组,members是成员名,空格分隔, writeable定义该组成员可以写入的repository.
members对应的就是keys目录下的文件名(无pub后缀)。
修改后,提交并push到服务端:
$ cd gitosis-admin
$ git add .
$ git commit -a -m 'setup users and access'
$ git push
初始化本地的项目并提交到git服务器
$ cd gcms
$ git init
$ git add .
$ git commit -a -m "Initial import"
$ git remote add origin [email protected]:gcms.git
$ git push origin master
问题:
ERROR:gitosis.server.main:Repository read access denied
fatal: The remote end hung up unexpectedly
解决:
1.members对应的就是keys目录下的文件名(无pub后缀)。
2.本地gitosis-admin配置文件修改后,需增加提交并push到服务端。
3.The reason was that I had 2 same ssh pub-keys (same key, different name) in gitosis-admin/keydir.
After deleting one of it, I can push to new repositories
Make sure o remove one of them from /home/git/.ssh/authorized_keys
使用Git Gui工具提交到服務器.
問題
選擇 修正上次提交(Amend Last Commit)後, 上传(push)報錯:
Pushing to [email protected]:gcms.git
To [email protected]:gcms.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:gcms.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
解决:
勾选“强制覆盖已有的分支(可能会丢失改动)”上传(push)。
整合Gitosis和redmine:
redmine的运行用户需與Gitosis的用戶一致.
分支
$ git checkout -b i18n master
$ git add .
$ git commit -a -m "國際化"
$ git push origin i18n
標簽
$ git checkout master
$ git tag 1.2.1
上传本地tag到远程仓库:
$ git push origin --tags
参考:
http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way
http://blog.longwin.com.tw/2011/03/linux-gitosis-git-server-2011/
http://www.jiangmiao.org/blog/1600.html
http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-3.noarch.rpm
http://blog.yunvi.com/272.html
http://blog.chinaunix.net/space.php?uid=405749&do=blog&id=28049