From b48f2298b2f89db22ce234299d6868c23223850e Mon Sep 17 00:00:00 2001 From: "msb@chromium.org" Date: Wed, 6 Oct 2010 19:48:39 +0000 Subject: [PATCH] git-cl: change the git-cl-repo dir to git_cl_repo so that we can import python does not seem to be able to import for a dir with dashes in it. BUG=none TEST=Ran git-cl help and verified it worked and new dir was created. Review URL: http://codereview.chromium.org/3530012 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61694 0039d316-1c4b-4281-b951-d872f2087c98 --- git-cl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git-cl b/git-cl index 4c568f7b6..2d9ac3042 100755 --- a/git-cl +++ b/git-cl @@ -4,7 +4,7 @@ # found in the LICENSE file. base_dir=$(dirname "$0") -repo="$base_dir/git-cl-repo" +repo="$base_dir/git_cl_repo" url="http://src.chromium.org/git/git-cl.git" cur_url=$(git config -f "$repo/.git/config" remote.origin.url) @@ -26,10 +26,10 @@ fi if [ ! -f "$repo/git-cl" ]; then git clone $url $repo -q -elif [ ! -e "$base_dir/git-cl-repo/.git" ]; then - echo "$0: $base_dir/git-cl-repo does not appear to be a git repo" +elif [ ! -e "$repo/.git" ]; then + echo "$0: $repo does not appear to be a git repo" elif [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then - (cd "$base_dir/git-cl-repo"; git pull -q) + (cd "$repo"; git pull -q) fi $repo/git-cl "$@"