未验证 提交 32e2de36 编写于 作者: M Mislav Marohnić 提交者: GitHub

Merge pull request #2237 from JPry/bug/branch_quoting

Change quotes in Sync command to be consistent with Git style
......@@ -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)
}
}
}
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册