Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
github
hub
提交
32e2de36
H
hub
项目概览
github
/
hub
9 个月 前同步成功
通知
3
Star
22523
Fork
2406
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
H
hub
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
32e2de36
编写于
8月 21, 2019
作者:
M
Mislav Marohnić
提交者:
GitHub
8月 21, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2237 from JPry/bug/branch_quoting
Change quotes in Sync command to be consistent with Git style
上级
1787dd9d
4e903f80
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
4 deletion
+4
-4
commands/sync.go
commands/sync.go
+2
-2
features/sync.feature
features/sync.feature
+2
-2
未找到文件。
commands/sync.go
浏览文件 @
32e2de36
...
...
@@ -114,7 +114,7 @@ func sync(cmd *Command, args *Args) {
}
ui
.
Printf
(
"%sUpdated branch %s%s%s (was %s).
\n
"
,
green
,
lightGreen
,
branch
,
resetColor
,
diff
.
A
[
0
:
7
])
}
else
{
ui
.
Errorf
(
"warning:
`
%s' seems to contain unpushed commits
\n
"
,
branch
)
ui
.
Errorf
(
"warning:
'
%s' seems to contain unpushed commits
\n
"
,
branch
)
}
}
else
if
gone
{
diff
,
err
:=
git
.
NewRange
(
fullBranch
,
fullDefaultBranch
)
...
...
@@ -128,7 +128,7 @@ func sync(cmd *Command, args *Args) {
git
.
Quiet
(
"branch"
,
"-D"
,
branch
)
ui
.
Printf
(
"%sDeleted branch %s%s%s (was %s).
\n
"
,
red
,
lightRed
,
branch
,
resetColor
,
diff
.
A
[
0
:
7
])
}
else
{
ui
.
Errorf
(
"warning:
`%s' was deleted on %s, but appears not merged into %s
\n
"
,
branch
,
remote
.
Name
,
defaultBranch
)
ui
.
Errorf
(
"warning:
'%s' was deleted on %s, but appears not merged into '%s'
\n
"
,
branch
,
remote
.
Name
,
defaultBranch
)
}
}
}
...
...
features/sync.feature
浏览文件 @
32e2de36
...
...
@@ -32,7 +32,7 @@ Feature: hub sync
When
I successfully run `hub sync`
Then the stderr should contain exactly
:
"""
warning:
`
feature' seems to contain unpushed commits\n
warning:
'
feature' seems to contain unpushed commits\n
"""
Scenario
:
Deletes local branch that had its upstream deleted
...
...
@@ -52,5 +52,5 @@ Feature: hub sync
When
I successfully run `hub sync`
Then the stderr should contain exactly
:
"""
warning:
`feature' was deleted on origin, but appears not merged into master
\n
warning:
'feature' was deleted on origin, but appears not merged into 'master'
\n
"""
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录