作者:zhanhailiang 日期:2015-01-07
直接使用命令行git pull操作正常,如下:
D:\vipshop\mstats\mstats-monitor>git pull
Updating 5050c42..e8b3bd9
Fast-forward
public/css/app.css | 30 ++++++++++++++++++
public/js/page.counts.js | 68 +++++++++++++++++++++++++++++++++--------
views/counts.html | 8 +++++
views/includes/module_list.html | 3 +-
4 files changed, 96 insertions(+), 13 deletions(-)
但是使用TortoiseGit pull时报错“/bin/sed: Bad file number”,详情如下:
git.exe pull -v --progress "origin"
/libexec/git-core/git-sh-setup: line 81: /bin/sed: Bad file number
From http://gitlab.tools.vipshop.com/wade.zhan/mstats-monitor
= [up to date] master -> origin/master
C:\Program Files (x86)\Git/libexec/git-core\git-pull: line 268: /bin/tr: Bad file number
Your configuration specifies to merge with the ref ‘master‘
from the remote, but no such ref was fetched.
git did not exit cleanly (exit code 1) (2090 ms @ 2015/1/7 10:08:05)
根据提示“Your configuration specifies to merge with the ref ‘master‘ from the remote, but no such ref was fetched.”,指的是merge远端引用master,但是fetch不到该引用。
查了下git help pull命令详情:
git pull [options] [<repository> [<refspec>…]]
怀疑是因为缺少参数导致,尝试下手动执行完整命令,如下:
D:\vipshop\mstats\mstats-monitor>git.exe pull -v --progress "origin" master
From http://gitlab.tools.vipshop.com/wade.zhan/mstats-monitor
* branch master -> FETCH_HEAD
= [up to date] master -> origin/master
Already up-to-date.
这里就定位到问题,应该缺省参数导致,右键菜单 TortoiseGit->Settings->Git->Edit local .git/config,在[branch "master"]修改remote = origin master,如下图:
然后就可以正常使用TortoiseGit pull了:
git.exe pull -v --progress "origin" master
From http://gitlab.tools.vipshop.com/wade.zhan/mstats-monitor
* branch master -> FETCH_HEAD
= [up to date] master -> origin/master
Already up-to-date.
Success (2121 ms @ 2015/1/7 10:08:38)
参考文章:
时间: 2024-11-11 07:34:20