gerrit: some fixes for the rfc script
authorCsaba Henk <csaba@gluster.com>
Sat, 23 Jul 2011 03:50:53 +0000 (05:50 +0200)
committerAnand Avati <avati@gluster.com>
Sat, 23 Jul 2011 16:07:58 +0000 (09:07 -0700)
In rebase_changes():

- Using "--all" for git fetch is bogus: the scope of this quantification is not
  over the tracked refs of the upsteam repo (which we do want, but that kind
  of universal quantification is already implied by the notion of "tracking"),
  but over the set of all the registered remotes, which is an annoying side effect.

- $EDITOR is weaker than the git configuration settings. For the purpose of the
  script, we need to override any kind of setting, and that can be done
  via $GIT_EDITOR.

Cf. git-fetch(1), git-commit(1).

Change-Id: Ia91ee5c4d42dce9248f26f7697528e3c97355871
BUG: 3234
Reviewed-on: http://review.gluster.com/86
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>
rfc.sh

diff --git a/rfc.sh b/rfc.sh
index aa097cc1582cb19f8d3135a61278e93448690ace..8dad0afa68b0dd1d1b04e0653a7fe53578fb6a1c 100755 (executable)
--- a/rfc.sh
+++ b/rfc.sh
@@ -31,9 +31,9 @@ function is_num()
 
 function rebase_changes()
 {
-    git fetch --all;
+    git fetch;
 
-    EDITOR=$0 git rebase -i origin/$branch;
+    GIT_EDITOR=$0 git rebase -i origin/$branch;
 }