git | Medcl

标签 Tag : git

git push 遭遇拒绝

<Date: 2013-08-08> <Author: medcl> <Category: DevOPS> Comments Off

C:\pub\xx.com>git push o2 master
git@xxx.com's password:
Counting objects: 1297, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (678/678), done.
Writing objects: 100% (728/728), 1.06 MiB, done.
Total 728 (delta 525), reused 1 (delta 0)
remote: error: refusing to update checked out branch: refs/heads/master
remote: error: By default, updating the current branch in a non-bare repository

remote: error: is denied, because it will make the index and work tree inconsist
ent
remote: error: with what you pushed, and will require 'git reset --hard' to matc
h
remote: error: the work tree to HEAD.
remote: error:
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to

remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into

remote: error: its current branch; however, this is not recommended unless you

remote: error: arranged to update its work tree to match what you pushed in some

remote: error: other way.
remote: error:
remote: error: To squelch this message and still keep the default behaviour, set

remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.

To git@xx.com:/home/git/repo/.git
 ! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to 'git@xxx.com:/home/git/repo/.git'

C:\pub\xx.com>git push o2 master

git@xxx.com's password:

Counting objects: 1297, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (678/678), done.

Writing objects: 100% (728/728), 1.06 MiB, done.

Total 728 (delta 525), reused 1 (delta 0)

remote: error: refusing to update checked out branch: refs/heads/master

remote: error: By default, updating the current branch in a non-bare repository

remote: error: is denied, because it will make the index and work tree inconsist

ent

remote: error: with what you pushed, and will require 'git reset --hard' to matc

remote: error: the work tree to HEAD.

remote: error:

remote: error: You can set 'receive.denyCurrentBranch' configuration variable to

remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into

remote: error: its current branch; however, this is not recommended unless you

remote: error: arranged to update its work tree to match what you pushed in some

remote: error: other way.

remote: error:

remote: error: To squelch this message and still keep the default behaviour, set

remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.

To git@xx.com:/home/git/repo/.git

! [remote rejected] master -> master (branch is currently checked out)

error: failed to push some refs to 'git@xxx.com:/home/git/repo/.git'

错误原因以及解决

这是由于git默认拒绝了push操作，需要进行设置，修改.git/config文件后面添加如下代码：
vim /home/git/repo/.git/config

[receive]
	denyCurrentBranch = ignore

1 2	[receive] denyCurrentBranch = ignore

使用git方式来发布war包，可以自动合并文件的改变，只会提交相关的变更文件，比普通传war包的方式要大大节省时间。

C:\pub\xxx>git remote -v
o2      git@xxx.com:/home/git/repo/.git (fetch)

1 2	C:\pub\xxx>git remote -v o2 git@xxx.com:/home/git/repo/.git (fetch)

本文来自: git push 遭遇拒绝

git

gitolite

<Date: 2013-06-05> <Author: medcl> <Category: 小道消息> Comments Off

外出进场，临时需要搭建git服务器，但是又不能脱离统一的源码管理。

#make sure to under root
sudo su
cp ~/.ssh/id_rsa.pub  /tmp/admin.pub
useradd git
passwd git
ssh-copy-id -i /tmp/admin.pub  git@localhost

yum install cpan
yum install perl-Time-HiRes


#switch to git
ssh git@localhost

rm .ssh/authorized_keys
git clone git://github.com/sitaramc/gitolite
mkdir -p $HOME/bin
gitolite/install -to $HOME/bin
gitolite setup -pk /tmp/admin.pub
exit

#check
ssh git@localhost

#switch back to root
cd /tmp
git clone git@localhost:gitolite-admin.git
#add key and modify config
#done

#make sure to under root

sudo su

cp ~/.ssh/id_rsa.pub /tmp/admin.pub

useradd git

passwd git

ssh-copy-id -i /tmp/admin.pub git@localhost

yum install cpan

yum install perl-Time-HiRes

#switch to git

ssh git@localhost

rm .ssh/authorized_keys

git clone git://github.com/sitaramc/gitolite

mkdir -p $HOME/bin

gitolite/install -to $HOME/bin

gitolite setup -pk /tmp/admin.pub

exit

#check

ssh git@localhost

#switch back to root

cd /tmp

git clone git@localhost:gitolite-admin.git

#add key and modify config

#done

本文来自: gitolite

git, gitolite

gitolite正确配置流程

<Date: 2012-07-23> <Author: medcl> <Category: DevOPS> Comments Off

……
前2天折腾的够呛，记录下。
开始之前一定仔细看完，http://sitaramc.github.com/gitolite/sts.html#ssh-ha
阅读这篇文章的其余部分 »

本文来自: gitolite正确配置流程

git

gitosis

<Date: 2012-04-01> <Author: medcl> <Category: Linux, VPS维护日志> Comments Off

安装 git sudo apt-get install git-core 配置 git服务器

#创建git服务器管理用户
sudo useradd -m git
sudo passwd git
#创建git仓库存储目录
sudo mkdir /home/git/repositories
#设置git仓库权限
sudo chown git:git /home/git/repositories
sudo chmod 755 /home/git/repositories

#创建git服务器管理用户

sudo useradd -m git

sudo passwd git

#创建git仓库存储目录

sudo mkdir /home/git/repositories

#设置git仓库权限

sudo chown git:git /home/git/repositories

sudo chmod 755 /home/git/repositories

初始化全局设置

git config --global user.name "medcl"
git config --global user.email "m@medcl.net"

1 2	git config --global user.name "medcl" git config --global user.email "m@medcl.net"

安装python的setup tool

#easy_install setuptools
wget http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c11.tar.gz 

tar zxvf setuptools-0.6c11.tar.gz
cd setuptools-0.6c11
python setup.py install 

yum install python-setuptools

#easy_install setuptools

wget http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c11.tar.gz

tar zxvf setuptools-0.6c11.tar.gz

cd setuptools-0.6c11

python setup.py install

yum install python-setuptools

获取并安装gitosis

cd /tmp
git clone git://github.com/res0nat0r/gitosis.git
cd gitosis
python2.4 setup.py install
#注意必须是2.4，如果你还有2.5之类的话，将会报：raise DistributionNotFound(req)

cd /tmp

git clone git://github.com/res0nat0r/gitosis.git

cd gitosis

python2.4 setup.py install

#注意必须是2.4，如果你还有2.5之类的话，将会报：raise DistributionNotFound(req)

阅读这篇文章的其余部分 »

本文来自: gitosis

git, gitosis, vps

jekyll&es-doc部署脚本

<Date: 2011-11-19> <Author: medcl> <Category: Linux, VPS维护日志> Comments Off

https://github.com/mojombo/jekyll/wiki/Deployment
jekyll&es-doc部署脚本
阅读这篇文章的其余部分 »

本文来自: jekyll&es-doc部署脚本

elasticsearch, git, 翻译

gitpage试玩并绑定域名

<Date: 2011-11-18> <Author: medcl> <Category: 乱搞> Comments Off

试玩下gitpage并绑定域名创建medcl.gihub.com,注：必须是这种格式的repo：你的用户名.github.com。

D:>mkdir medcl.github.com

D:>cd medcl.github.com

D:\medcl.github.com>  git init
Initialized empty Git repository in /cygdrive/d/github.medc
l.com/.git/

D:\medcl.github.com>echo "I'll be back!">index.html

D:\medcl.github.com>echo medcl.github.com>CNAME

D:\medcl.github.com>cat CNAME
medcl.github.com

D:\medcl.github.com>git add .

D:\medcl.github.com>git commit -m 'first commit'
[master (root-commit) f09e419] first commit
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 README

D:\medcl.github.com>git push -u origin master
Counting objects: 3, done.
Writing objects: 100% (3/3), 199 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@github.com:medcl/medcl.github.com.git
 * [new branch]      master -> master
Branch master set up to track remote branch master from origin.

D:>mkdir medcl.github.com

D:>cd medcl.github.com

D:\medcl.github.com> git init

Initialized empty Git repository in /cygdrive/d/github.medc

l.com/.git/

D:\medcl.github.com>echo "I'll be back!">index.html

D:\medcl.github.com>echo medcl.github.com>CNAME

D:\medcl.github.com>cat CNAME

medcl.github.com

D:\medcl.github.com>git add .

D:\medcl.github.com>git commit -m 'first commit'

[master (root-commit) f09e419] first commit

0 files changed, 0 insertions(+), 0 deletions(-)

create mode 100644 README

D:\medcl.github.com>git push -u origin master

Counting objects: 3, done.

Writing objects: 100% (3/3), 199 bytes, done.

Total 3 (delta 0), reused 0 (delta 0)

To git@github.com:medcl/medcl.github.com.git

* [new branch] master -> master

Branch master set up to track remote branch master from origin.

DNS添加一条A记录
github.medcl.com 207.97.227.245

ok,访问下看看
http://github.medcl.com/
http://medcl.github.com/
http://github.medcl.com/ElasticSearch.Net/

参考：
http://pages.github.com/
http://kyle.xlau.org/2010/12/29/github-CNAME.html

本文来自: gitpage试玩并绑定域名

cname, git, gitpage

git push与分支操作

<Date: 2011-10-06> <Author: medcl> <Category: 工具命令> Comments Off

git push相关 


$ git push ssh://git@dev.lemote.com/rt4ls.git master // 把本地仓库提交到远程仓库的master分支中

$ git remote add origin ssh://git@dev.lemote.com/rt4ls.git
$ git push origin master 

这两个操作是等价的，第二个操作的第一行的意思是添加一个标记，让origin指向ssh://git@dev.lemote.com/rt4ls.git，也就是说你操 作origin的时候，实际上就是在操作ssh://git@dev.lemote.com/rt4ls.git。origin在这里完全可以理解为后者 的别名。

    需要说明的是，默认情况下这条语句等价于提交本地的master仓库到远程仓库，并作为远程的master分支。
    如果想把本地的某个分支test提交到远程仓库，并作为远程仓库的master分支，或者作为另外一个名叫test的分支，那么可以这么做。

$ git push origin test:master         // 提交本地test分支作为远程的master分支
$ git push origin test:test              // 提交本地test分支作为远程的test分支

如果想删除远程的分支呢？类似于上面，如果:左边的分支为空，那么将删除:右边的远程的分支。

$ git push origin :test              // 刚提交到远程的test将被删除，但是本地还会保存的，不用担心 





Git pull certain branch from github

http://stackoverflow.com/questions/1709177/git-pull-certain-branch-from-github


$ git pull origin other-branch


//or

git fetch origin other-branch && git merge other-branch


git fetch origin other-branch


git branch -f remote_branch_name origin/remote_branch_name
git checkout remote_branch name

git push相关

$ git push ssh://git@dev.lemote.com/rt4ls.git master // 把本地仓库提交到远程仓库的master分支中

$ git remote add origin ssh://git@dev.lemote.com/rt4ls.git

$ git push origin master

这两个操作是等价的，第二个操作的第一行的意思是添加一个标记，让origin指向ssh://git@dev.lemote.com/rt4ls.git，也就是说你操作origin的时候，实际上就是在操作ssh://git@dev.lemote.com/rt4ls.git。origin在这里完全可以理解为后者的别名。

需要说明的是，默认情况下这条语句等价于提交本地的master仓库到远程仓库，并作为远程的master分支。

如果想把本地的某个分支test提交到远程仓库，并作为远程仓库的master分支，或者作为另外一个名叫test的分支，那么可以这么做。

$ git push origin test:master // 提交本地test分支作为远程的master分支

$ git push origin test:test // 提交本地test分支作为远程的test分支

如果想删除远程的分支呢？类似于上面，如果:左边的分支为空，那么将删除:右边的远程的分支。

$ git push origin :test // 刚提交到远程的test将被删除，但是本地还会保存的，不用担心

Git pull certain branch from github

http://stackoverflow.com/questions/1709177/git-pull-certain-branch-from-github

$ git pull origin other-branch

//or

git fetch origin other-branch && git merge other-branch

git fetch origin other-branch

git branch -f remote_branch_name origin/remote_branch_name

git checkout remote_branch name

本文来自: git push与分支操作

git

git快速入门

<Date: 2010-03-24> <Author: medcl> <Category: 小道消息, 资源分享> Comments Off

首先到http://github.com/申请一个300M的免费空间（足够了），然后按照下面的流程操作，注意SSHkey生成的那步

From http://hi.baidu.com/kissdev/blog/item/944aa2fab2817215a8d311f1.html

1. GIT

相比CVS/SVN，Git 的优势：
－支持离线开发，离线Repository
－强大的分支功能，适合多个独立开发者协作
－速度块

2. GitHub

GitHub是一个托管Git （开源或闭源）项目的网站，闭源收费

阅读这篇文章的其余部分 »

本文来自: git快速入门

git, github