diff mbox

Remove dryrun wrapper from git-new-workdir invocation.

Message ID 1380921598-2247-1-git-send-email-ryan.arnold@linaro.org
State New
Headers show

Commit Message

Ryan S. Arnold Oct. 4, 2013, 9:19 p.m. UTC
From: "Ryan S. Arnold" <ryan.arnold@linaro.org>

Failing to perform the git-new-workdir during a dryrun prevents later
commands from working in dryrun.
---
 lib/checkout.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rob Savoye Oct. 5, 2013, 3:56 p.m. UTC | #1
On 10/04/2013 03:19 PM, Ryan S. Arnold wrote:
> Failing to perform the git-new-workdir during a dryrun prevents later
> commands from working in dryrun.
  I'm not 100% sure this patch is correct, but applied it. Dryrun may
need to assume the directory for the branch already exists, as the point
of --dryrun is to not actually do anything, just print the commands.

    - rob -
Ryan S. Arnold Oct. 7, 2013, 9:22 p.m. UTC | #2
I see that you applied dryrun to the rest of the git statements, so my
patch doesn't make sense. Of course it won't work unless there's a git
repository that is already cloned to use as a source for the
git-new-workdir.



On Sat, Oct 5, 2013 at 10:56 AM, Rob Savoye <rob.savoye@linaro.org> wrote:
> On 10/04/2013 03:19 PM, Ryan S. Arnold wrote:
>> Failing to perform the git-new-workdir during a dryrun prevents later
>> commands from working in dryrun.
>   I'm not 100% sure this patch is correct, but applied it. Dryrun may
> need to assume the directory for the branch already exists, as the point
> of --dryrun is to not actually do anything, just print the commands.
>
>     - rob -
>
>
Rob Savoye Oct. 7, 2013, 9:25 p.m. UTC | #3
On 10/07/2013 03:22 PM, Ryan Arnold wrote:
> I see that you applied dryrun to the rest of the git statements, so my
> patch doesn't make sense. Of course it won't work unless there's a git
> repository that is already cloned to use as a source for the
> git-new-workdir.
  Ah, you have a point, if the initial checkout of master doesn't exist,
then git-new-workdir won't work. I can look into forcing the initial
checkout. I already had master checked out, so it always worked.

    - rob -
Rob Savoye Oct. 7, 2013, 9:29 p.m. UTC | #4
On 10/07/2013 03:22 PM, Ryan Arnold wrote:
> I see that you applied dryrun to the rest of the git statements, so my
> patch doesn't make sense. Of course it won't work unless there's a git
> repository that is already cloned to use as a source for the
> not actually do anything, just print the commands.
  Ok, fix pushed to master.

    - rob -
diff mbox

Patch

diff --git a/lib/checkout.sh b/lib/checkout.sh
index 86f537b..baca110 100644
--- a/lib/checkout.sh
+++ b/lib/checkout.sh
@@ -81,7 +81,7 @@  checkout()
 		if test x"${branch}" = x; then
 		    local out="`git clone $1 ${srcdir}`"
 		else
-		    dryrun "git-new-workdir ${local_snapshots}/${tool}.git ${srcdir} ${branch}"
+		    git-new-workdir ${local_snapshots}/${tool}.git ${srcdir} ${branch}
 		fi
 	    fi
 	    ;;