| OLD | NEW | 
|   1 #!/usr/bin/env bash |   1 #!/usr/bin/env bash | 
|   2 # Copyright (c) 2010 The Chromium Authors. All rights reserved. |   2 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 
|   3 # Use of this source code is governed by a BSD-style license that can be |   3 # Use of this source code is governed by a BSD-style license that can be | 
|   4 # found in the LICENSE file. |   4 # found in the LICENSE file. | 
|   5  |   5  | 
|   6 # This script will try to sync the bootstrap directories and then defer control. |   6 # This script will try to sync the bootstrap directories and then defer control. | 
|   7  |   7  | 
|   8 base_dir=$(dirname "$0") |   8 base_dir=$(dirname "$0") | 
|   9  |   9  | 
|  10 # Test git and git --version. |  10 # Test git and git --version. | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
|  39 } |  39 } | 
|  40  |  40  | 
|  41  |  41  | 
|  42 # Update git checkouts prior the cygwin check, we don't want to use msysgit. |  42 # Update git checkouts prior the cygwin check, we don't want to use msysgit. | 
|  43 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ] |  43 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ] | 
|  44 then |  44 then | 
|  45   cd $base_dir |  45   cd $base_dir | 
|  46   test_git_svn |  46   test_git_svn | 
|  47   # work around a git-svn --quiet bug |  47   # work around a git-svn --quiet bug | 
|  48   OUTPUT=`git svn rebase -q -q` |  48   OUTPUT=`git svn rebase -q -q` | 
|  49   if [[ ! "$OUTPUT" =~ Current.branch ]]; then |  49   if [[ ! "$OUTPUT" == *Current.branch* ]]; then | 
|  50     echo $OUTPUT |  50     echo $OUTPUT | 
|  51   fi |  51   fi | 
|  52   cd - > /dev/null |  52   cd - > /dev/null | 
|  53 fi |  53 fi | 
|  54  |  54  | 
|  55 # We're on POSIX. We can now safely look for svn checkout. |  55 # We're on POSIX. We can now safely look for svn checkout. | 
|  56 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] |  56 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] | 
|  57 then |  57 then | 
|  58   # Update the bootstrap directory to stay up-to-date with the latest |  58   # Update the bootstrap directory to stay up-to-date with the latest | 
|  59   # depot_tools. |  59   # depot_tools. | 
|  60   svn -q up "$base_dir" |  60   svn -q up "$base_dir" | 
|  61 fi |  61 fi | 
| OLD | NEW |