From patchwork Fri Oct 11 22:14:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ryan S. Arnold" X-Patchwork-Id: 20988 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 403BE2611D for ; Fri, 11 Oct 2013 22:14:35 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id x10sf8994596pdj.5 for ; Fri, 11 Oct 2013 15:14:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=fmYKhTBZ1QQwBX+kbJ+5LRMmWCTQGlIikPf8uF21Ov0=; b=ArDsjNnDji0450xbVB5MTmiHDmTeL3cU9RE1FLaW75FI8UZGJ8n6QXtpkcYwGZE9DE U2iOVdlmXIIwCUWu5BaToHniWKhTJB3GKjiOOY004w64tkRyLWGthZ91sGnkSKLrAacQ 1d4OVgbelsO/mKUqtLvqGFrRx08QzRpfmpKHWCdofQWLX3iDamTpO+yA2I+6CsD2tbaL ILiD0xBiDYXhb/vVkhwxsUnZTxH11HTlHZNkNC1xgRS3J+JC/SyrF+gm9sjvdzVQxhUM /Buks1En+fFnzR9Cg5rV9e3Xe1XNbO+ZST/vUcr/KuvQz+behEzaKg2G5lExoz+Ozr+W gJUQ== X-Received: by 10.66.5.226 with SMTP id v2mr7494621pav.22.1381529674212; Fri, 11 Oct 2013 15:14:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.64.38 with SMTP id l6ls1757496qes.89.gmail; Fri, 11 Oct 2013 15:14:34 -0700 (PDT) X-Received: by 10.52.26.69 with SMTP id j5mr19439881vdg.21.1381529674064; Fri, 11 Oct 2013 15:14:34 -0700 (PDT) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id ip2si17519078vcb.41.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 15:14:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id h11so3256556vbh.30 for ; Fri, 11 Oct 2013 15:14:34 -0700 (PDT) X-Gm-Message-State: ALoCoQmr1JKuRVb8RLh0TkGo3E6uLGZfQHTMoxr0ONYuQsY/W4yyoNJi4N1fmBwmCZoevJitCKpB X-Received: by 10.52.173.165 with SMTP id bl5mr19275095vdc.18.1381529673937; Fri, 11 Oct 2013 15:14:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp73345vcz; Fri, 11 Oct 2013 15:14:33 -0700 (PDT) X-Received: by 10.50.234.162 with SMTP id uf2mr4587537igc.48.1381529673204; Fri, 11 Oct 2013 15:14:33 -0700 (PDT) Received: from mail-ie0-f173.google.com (mail-ie0-f173.google.com [209.85.223.173]) by mx.google.com with ESMTPS id pj3si41875912icc.76.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 15:14:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.223.173 is neither permitted nor denied by best guess record for domain of ryan.arnold@linaro.org) client-ip=209.85.223.173; Received: by mail-ie0-f173.google.com with SMTP id u16so2026488iet.32 for ; Fri, 11 Oct 2013 15:14:32 -0700 (PDT) X-Received: by 10.43.60.139 with SMTP id ws11mr12916086icb.12.1381529672357; Fri, 11 Oct 2013 15:14:32 -0700 (PDT) Received: from badwing.hsd1.mn.comcast.net. (c-71-195-40-9.hsd1.mn.comcast.net. [71.195.40.9]) by mx.google.com with ESMTPSA id hv5sm5079669igb.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 11 Oct 2013 15:14:31 -0700 (PDT) From: "Ryan S. Arnold" To: Rob Savoye Cc: patches@linaro.org, "Ryan S. Arnold" Subject: [PATCH][COMMITTED] Correction for git commit 47e9ce2141cbe48d852b1bb2e9679c3d4fbaf9d2 Date: Fri, 11 Oct 2013 17:14:23 -0500 Message-Id: <1381529663-1017-1-git-send-email-ryan.arnold@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.arnold@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "Ryan S. Arnold" For some reason the merge for patch "[PATCH] Fix git clone to get repo without branch name as part of the url" merged the change into the wrong spot. This patch fixes it and puts it on the correct 'if' leg. I tested with a build. Ryan S. Arnold --- lib/checkout.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/checkout.sh b/lib/checkout.sh index 30c7941..9842e69 100644 --- a/lib/checkout.sh +++ b/lib/checkout.sh @@ -79,12 +79,12 @@ checkout() dryrun "(cd ${srcdir} && git pull origin ${branch})" else if test x"${branch}" = x; then - # Strip off the "/" from $1 to get the repo address - local repo="`echo $1 | sed -e "s:\(^.*/${tool}.git\).*:\1:"`" - dryrun "git clone ${repo} ${local_snapshots}/${tool}.git" + dryrun "git clone $1 ${srcdir}" else if test ! -d ${local_snapshots}/${tool}.git; then - dryrun "git clone $1 ${srcdir}" + # Strip off the "/" from $1 to get the repo address + local repo="`echo $1 | sed -e "s:\(^.*/${tool}.git\).*:\1:"`" + dryrun "git clone ${repo} ${local_snapshots}/${tool}.git" fi dryrun "git-new-workdir ${local_snapshots}/${tool}.git ${srcdir} ${branch}" fi