From a4e4ef38a27acf49dbaf56c85ec8012d8ca92661 Mon Sep 17 00:00:00 2001 From: "szager@chromium.org" Date: Tue, 18 Mar 2014 20:45:46 +0000 Subject: [PATCH] Fix push-basic.sh. How did it ever pass? We may never know. BUG= Review URL: https://codereview.chromium.org/203383005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257738 0039d316-1c4b-4281-b951-d872f2087c98 --- tests/push-basic.sh | 2 +- tests/test-lib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/push-basic.sh b/tests/push-basic.sh index f84cdeca7..18936c1c8 100755 --- a/tests/push-basic.sh +++ b/tests/push-basic.sh @@ -45,7 +45,7 @@ setup_gitgit $URL/edit test_expect_success "Base URL contains branch name" \ - "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:' | grep -q '@master'" + "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:[[:space:]]*[^<]' | grep -q '@master'" test_expect_success "git-cl push ok" \ "$GIT_CL push -f" diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 46d34de36..4c1901065 100755 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -100,7 +100,7 @@ setup_initgit() { git commit -qam "second commit" # Hack: make sure master is not the current branch # otherwise push will give a warning - git checkout -q -b foo + git checkout -q --detach master ) }