From 224e25d8cc5d4720be3413adcf8d5bc2e5cbb12c Mon Sep 17 00:00:00 2001
From: Josh Bleecher Snyder <josharian@gmail.com>
Date: Tue, 4 Jun 2013 17:30:23 -0700
Subject: [PATCH] Stop using $USER in misc/review

For folks whose $USER doesn't match their
Gerrit username, editing misc/review is not a
great solution, since the changes cannot be
committed (nf notwithstanding).

Instead, let ssh config files do their thing;
these are not part of the repo, and thus can
be set once and merrily forgotten.

Change-Id: If03fe05e5779553ed1f98310e8f22b0635ada7bb
---
 misc/review                       | 5 +----
 website/content/docs/contributing | 7 ++++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/misc/review b/misc/review
index 5295f0210..7a00ac9cc 100755
--- a/misc/review
+++ b/misc/review
@@ -25,7 +25,4 @@ scalar(<STDIN>);
     system("git", "commit", "--amend") and die "git commit --amend fail\n";
 }
 
-my $user = $ENV{USER};
-$user = "adg" if $user eq "nf";
-
-exec("git", "push", "ssh://$user\@camlistore.org:29418/camlistore", "HEAD:refs/for/master");
+exec("git", "push", "ssh://camlistore.org:29418/camlistore", "HEAD:refs/for/master");
diff --git a/website/content/docs/contributing b/website/content/docs/contributing
index 63499dbe5..8ee8faabb 100644
--- a/website/content/docs/contributing
+++ b/website/content/docs/contributing
@@ -23,7 +23,12 @@
 <ul class='lispaced'>
 	<li>Camlistore requires changes to be reviewed before they are committed.</li>
 	<li>Sign in to Gerrit at <a href="http://camlistore.org/r/">http://camlistore.org/r/</a> and set your username + SSH key(s).
-            You'll want your Gerrit username to be the same as your local machine's $USER, else you'll need to modify the misc/review script.</li>
+            If your Gerrit username is not the same as your local machine's $USER, add a section like:
+<pre>
+Host camlistore.org
+  User &lt;your-gerrit-username&gt;
+</pre>
+            to your ssh config file (probably <tt>~/.ssh/config</tt>).</li>
 	<li>Usual Work Flow</li>
 		<ul>
                         <li>Create a topic branch. Commit away. If you modify or squash your commits during review, don't touch <a href="http://gerrit.googlecode.com/svn/documentation/2.2.1/user-changeid.html">the Change-Id line</a>.</li>