From 022d06ef61d6acf939c91506e334f00db4ca9196 Mon Sep 17 00:00:00 2001 From: "pgervais@chromium.org" Date: Tue, 29 Apr 2014 17:08:12 +0000 Subject: [PATCH] git new-branch displays an explanatory line. BUG= Review URL: https://codereview.chromium.org/253013004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266905 0039d316-1c4b-4281-b951-d872f2087c98 --- git_new_branch.py | 2 +- subprocess2.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git_new_branch.py b/git_new_branch.py index b021d4c1f4..810aa02e1b 100755 --- a/git_new_branch.py +++ b/git_new_branch.py @@ -41,12 +41,12 @@ def main(args): # TODO(iannucci): Detect unclean workdir then stash+pop if we need to # teleport to a conflicting portion of history? run('checkout', '--track', opts.upstream, '-b', opts.branch_name) - get_or_create_merge_base(opts.branch_name) except subprocess2.CalledProcessError as cpe: sys.stdout.write(cpe.stdout) sys.stderr.write(cpe.stderr) return 1 + sys.stderr.write('Switched to branch %s.' % opts.branch_name) if __name__ == '__main__': # pragma: no cover diff --git a/subprocess2.py b/subprocess2.py index 716ef20fae..3beeaeb58e 100644 --- a/subprocess2.py +++ b/subprocess2.py @@ -510,5 +510,5 @@ def check_output(args, **kwargs): """ kwargs.setdefault('stdin', VOID) if 'stdout' in kwargs: - raise ValueError('stdout argument not allowed, it will be overridden.') + raise ValueError('stdout argument not allowed, it would be overridden.') return check_call_out(args, stdout=PIPE, **kwargs)[0]