Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c1d71724
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c1d71724
编写于
12月 01, 2015
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix npe in non git workspaces
上级
c70b4866
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
12 addition
and
4 deletion
+12
-4
src/vs/workbench/parts/git/electron-browser/gitApp.ts
src/vs/workbench/parts/git/electron-browser/gitApp.ts
+10
-2
src/vs/workbench/parts/git/node/git.lib.ts
src/vs/workbench/parts/git/node/git.lib.ts
+2
-2
未找到文件。
src/vs/workbench/parts/git/electron-browser/gitApp.ts
浏览文件 @
c1d71724
...
...
@@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
import
{
Server
}
from
'
vs/base/node/service.cp
'
;
import
objects
=
require
(
'
vs/base/common/objects
'
);
import
uri
from
'
vs/base/common/uri
'
;
import
{
IRawGitService
}
from
'
vs/workbench/parts/git/common/git
'
;
import
{
IRawGitService
,
GitErrorCodes
}
from
'
vs/workbench/parts/git/common/git
'
;
import
gitlib
=
require
(
'
vs/workbench/parts/git/node/git.lib
'
);
import
{
RawGitService
,
DelayedRawGitService
}
from
'
vs/workbench/parts/git/node/rawGitService
'
;
import
{
join
,
dirname
,
normalize
}
from
'
path
'
;
...
...
@@ -23,6 +23,7 @@ class IPCRawGitService extends DelayedRawGitService {
}
else
{
const
gitRootPath
=
uri
.
parse
(
require
.
toUrl
(
'
vs/workbench/parts/git/electron-main
'
)).
fsPath
;
const
bootstrapPath
=
`
${
uri
.
parse
(
require
.
toUrl
(
'
bootstrap
'
)).
fsPath
}
.js`
;
workspaceRoot
=
normalize
(
workspaceRoot
);
const
env
=
objects
.
assign
({},
process
.
env
,
{
GIT_ASKPASS
:
join
(
gitRootPath
,
'
askpass.sh
'
),
...
...
@@ -38,8 +39,15 @@ class IPCRawGitService extends DelayedRawGitService {
env
:
env
});
const
repo
=
git
.
open
(
normalize
(
workspaceRoot
)
);
const
repo
=
git
.
open
(
workspaceRoot
);
const
promise
=
repo
.
getRoot
()
.
then
<
string
>
(
null
,
(
err
:
gitlib
.
GitError
)
=>
{
if
(
err
instanceof
gitlib
.
GitError
&&
err
.
gitErrorCode
===
GitErrorCodes
.
NotAGitRepository
)
{
return
workspaceRoot
;
}
return
TPromise
.
wrapError
(
err
);
})
.
then
(
root
=>
realpath
(
root
))
.
then
(
root
=>
git
.
open
(
root
))
.
then
(
repo
=>
new
RawGitService
(
repo
));
...
...
src/vs/workbench/parts/git/node/git.lib.ts
浏览文件 @
c1d71724
...
...
@@ -186,6 +186,8 @@ export class Git {
if
(
/Authentication failed/
.
test
(
result
.
stderr
))
{
gitErrorCode
=
GitErrorCodes
.
AuthenticationFailed
;
}
else
if
(
/Not a git repository/
.
test
(
result
.
stderr
))
{
gitErrorCode
=
GitErrorCodes
.
NotAGitRepository
;
}
else
if
(
/bad config file/
.
test
(
result
.
stderr
))
{
gitErrorCode
=
GitErrorCodes
.
BadConfigFile
;
}
else
if
(
/cannot make pipe for command substitution|cannot create standard input pipe/
.
test
(
result
.
stderr
))
{
...
...
@@ -496,8 +498,6 @@ export class Repository {
return
this
.
run
([
'
fetch
'
]).
then
(
null
,
(
err
:
GitError
)
=>
{
if
(
/No remote repository specified
\.
/
.
test
(
err
.
stderr
))
{
err
.
gitErrorCode
=
GitErrorCodes
.
NoRemoteRepositorySpecified
;
}
else
if
(
/Not a git repository/
.
test
(
err
.
stderr
))
{
err
.
gitErrorCode
=
GitErrorCodes
.
NotAGitRepository
;
}
else
if
(
/Could not read from remote repository/
.
test
(
err
.
stderr
))
{
err
.
gitErrorCode
=
GitErrorCodes
.
RemoteConnectionError
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录