From abc0ca372c8669aaf8ed718b884e567ee44ee9ba Mon Sep 17 00:00:00 2001 From: "tzik@chromium.org" Date: Mon, 25 Nov 2013 14:44:39 +0000 Subject: [PATCH] Fix separate git-dir handling .git can be a file that contains actual git-dir. crup-runner couldn't handle this case as managed checkout. Review URL: https://codereview.chromium.org/84543002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@237074 0039d316-1c4b-4281-b951-d872f2087c98 --- crup-runner.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crup-runner.sh b/crup-runner.sh index 4765a2f51..56799dfce 100755 --- a/crup-runner.sh +++ b/crup-runner.sh @@ -90,7 +90,8 @@ cd "$solution" 1>/dev/null if [ "$solution" = "$1" ]; then # Skip git checkouts not managed by crup. - if ! grep -q -s "The Chromium Authors" ".git/description"; then + gitdir="$(git rev-parse --git-dir)" + if ! grep -q -s "The Chromium Authors" "$gitdir/description"; then echo "Skipping unmanaged git directory $1" 1>&2 exit 0 fi