Merge branch 'master' of git@github.com:parrot/parrot

parrot · Aug 9, 2011 · 3764b88 · 3764b88
2 parents 3bc8f96 + 70cca2a
commit 3764b88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config/gen/config_pm/config_pir.in b/config/gen/config_pm/config_pir.in
@@ -42,6 +42,7 @@ undefined values) is undefined, and may be rather funky.
 
 .sub _config
     .local string prefix, conf_file
+    .local pmc ex
     prefix = interpinfo .INTERPINFO_RUNTIME_PREFIX
 
     $S0 = concat prefix, "/runtime"
@@ -58,6 +59,8 @@ undefined values) is undefined, and may be rather funky.
         $P0.'stat'($S0)
         goto L1
   file_not_found:
+    .get_results (ex)
+    finalize ex
     # Treat it as installed parrot.
     conf_file = "@libdir@@versiondir@/include/config.fpmc"
     goto L2
@@ -85,7 +88,6 @@ undefined values) is undefined, and may be rather funky.
     .return( conf_hash )
 
 error:
-    .local pmc ex
     .get_results (ex)
     $S0 = "Can't read '"
     $S0 .= conf_file

diff --git a/docs/project/git_workflow.pod b/docs/project/git_workflow.pod
@@ -70,7 +70,7 @@ get the latest commits with:
 
 Then use this syntax to track the remote branch with a local branch:
 
-  git checkout -b username/foo origin/username/foo
+  git checkout -t origin/username/foo
 
 If you are using a very old version of Git, such as 1.5.x.x or older, you will
 want to tell it to track the remote branch: