summaryrefslogtreecommitdiffstats
path: root/rfc.sh
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-07-23 05:50:53 +0200
committerAnand Avati <avati@gluster.com>2011-07-23 09:07:58 -0700
commit434da60ba4ce9a2b47ea47a7790ce48a342de00a (patch)
treef2fe7eeafdbcf3d01948a0ba2d3ac7b557a345b5 /rfc.sh
parent2d29b67a63779ac7b115d214bb037c12b122cf2f (diff)
gerrit: some fixes for the rfc script
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>
Diffstat (limited to 'rfc.sh')
-rwxr-xr-xrfc.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/rfc.sh b/rfc.sh
index aa097cc..8dad0af 100755
--- 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;
}