This is an automated email from the ASF dual-hosted git repository.
attilapiros pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/spark-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new c7e0d8e Promoting SSH remotes and document their purpose, mentioning
GitBox
c7e0d8e is described below
commit c7e0d8e60838cefabf5b06f45e32abb64612db01
Author: attilapiros <[email protected]>
AuthorDate: Fri Mar 19 19:16:34 2021 +0100
Promoting SSH remotes and document their purpose, mentioning GitBox
Author: attilapiros <[email protected]>
Closes #329 from attilapiros/update_committer_page.
---
committers.md | 25 ++++++++++++++-----------
site/committers.html | 29 ++++++++++++++++-------------
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/committers.md b/committers.md
index 88c8fb5..529fdfe 100644
--- a/committers.md
+++ b/committers.md
@@ -170,20 +170,21 @@ To use the `merge_spark_pr.py` script described below, you
will need to add a git remote called `apache` at
`https://github.com/apache/spark`,
as well as one called `apache-github` at `git://github.com/apache/spark`.
-You will likely also have a remote `origin` pointing to your fork of Spark, and
-`upstream` pointing to the `apache/spark` GitHub repo.
+The `apache` (the default value of `PUSH_REMOTE_NAME` environment variable) is
the remote used for pushing the squashed commits
+and `apache-github` (default value of `PR_REMOTE_NAME`) is the remote used for
pulling the changes.
+By using two separate remotes for these two actions the result of the
`merge_spark_pr.py` can be tested without pushing it
+into the official Spark repo just by specifying your fork in the
`PUSH_REMOTE_NAME` variable.
-If correct, your `git remote -v` should look like:
+After cloning your fork of Spark you already have a remote `origin` pointing
there. So if correct, your `git remote -v`
+contains at least these lines:
```
-apache https://github.com/apache/spark.git (fetch)
-apache https://github.com/apache/spark.git (push)
-apache-github git://github.com/apache/spark (fetch)
-apache-github git://github.com/apache/spark (push)
-origin https://github.com/[your username]/spark.git (fetch)
-origin https://github.com/[your username]/spark.git (push)
-upstream https://github.com/apache/spark.git (fetch)
-upstream https://github.com/apache/spark.git (push)
+apache [email protected]:apache/spark-website.git (fetch)
+apache [email protected]:apache/spark-website.git (push)
+apache-github [email protected]:apache/spark-website.git (fetch)
+apache-github [email protected]:apache/spark-website.git (push)
+origin [email protected]:[your username]/spark-website.git (fetch)
+origin [email protected]:[your username]/spark-website.git (push)
```
For the `apache` repo, you will need to set up command-line authentication to
GitHub. This may
@@ -192,6 +193,8 @@ include setting up an SSH key and/or personal access token.
See:
- https://help.github.com/articles/connecting-to-github-with-ssh/
-
https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/
+To check whether the necessary write access are already granted please visit
[GitBox](https://gitbox.apache.org/setup/).
+
Ask `[email protected]` if you have trouble with these steps, or want help
doing your first merge.
<h4>Merge Script</h4>
diff --git a/site/committers.html b/site/committers.html
index 9cc9d97..7760439 100644
--- a/site/committers.html
+++ b/site/committers.html
@@ -618,19 +618,20 @@ it. So please don’t add any test commits or
anything like that, only real
will need to add a git remote called <code class="language-plaintext
highlighter-rouge">apache</code> at <code class="language-plaintext
highlighter-rouge">https://github.com/apache/spark</code>,
as well as one called <code class="language-plaintext
highlighter-rouge">apache-github</code> at <code class="language-plaintext
highlighter-rouge">git://github.com/apache/spark</code>.</p>
-<p>You will likely also have a remote <code class="language-plaintext
highlighter-rouge">origin</code> pointing to your fork of Spark, and
-<code class="language-plaintext highlighter-rouge">upstream</code> pointing to
the <code class="language-plaintext highlighter-rouge">apache/spark</code>
GitHub repo.</p>
-
-<p>If correct, your <code class="language-plaintext highlighter-rouge">git
remote -v</code> should look like:</p>
-
-<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code>apache https://github.com/apache/spark.git (fetch)
-apache https://github.com/apache/spark.git (push)
-apache-github git://github.com/apache/spark (fetch)
-apache-github git://github.com/apache/spark (push)
-origin https://github.com/[your username]/spark.git (fetch)
-origin https://github.com/[your username]/spark.git (push)
-upstream https://github.com/apache/spark.git (fetch)
-upstream https://github.com/apache/spark.git (push)
+<p>The <code class="language-plaintext highlighter-rouge">apache</code> (the
default value of <code class="language-plaintext
highlighter-rouge">PUSH_REMOTE_NAME</code> environment variable) is the remote
used for pushing the squashed commits
+and <code class="language-plaintext highlighter-rouge">apache-github</code>
(default value of <code class="language-plaintext
highlighter-rouge">PR_REMOTE_NAME</code>) is the remote used for pulling the
changes.
+By using two separate remotes for these two actions the result of the <code
class="language-plaintext highlighter-rouge">merge_spark_pr.py</code> can be
tested without pushing it
+into the official Spark repo just by specifying your fork in the <code
class="language-plaintext highlighter-rouge">PUSH_REMOTE_NAME</code>
variable.</p>
+
+<p>After cloning your fork of Spark you already have a remote <code
class="language-plaintext highlighter-rouge">origin</code> pointing there. So
if correct, your <code class="language-plaintext highlighter-rouge">git remote
-v</code>
+contains at least these lines:</p>
+
+<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code>apache [email protected]:apache/spark-website.git
(fetch)
+apache [email protected]:apache/spark-website.git (push)
+apache-github [email protected]:apache/spark-website.git (fetch)
+apache-github [email protected]:apache/spark-website.git (push)
+origin [email protected]:[your username]/spark-website.git (fetch)
+origin [email protected]:[your username]/spark-website.git (push)
</code></pre></div></div>
<p>For the <code class="language-plaintext highlighter-rouge">apache</code>
repo, you will need to set up command-line authentication to GitHub. This may
@@ -641,6 +642,8 @@ include setting up an SSH key and/or personal access token.
See:</p>
<li>https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/</li>
</ul>
+<p>To check whether the necessary write access are already granted please
visit <a href="https://gitbox.apache.org/setup/";>GitBox</a>.</p>
+
<p>Ask <code class="language-plaintext
highlighter-rouge">[email protected]</code> if you have trouble with these
steps, or want help doing your first merge.</p>
<h4>Merge Script</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
