From 53726a000580365bd3c96937b5ecf8ccddc3ec86 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 17 May 2010 13:30:46 +0100
Subject: [PATCH] devel/review: make the range argument optional
Rather than calling devel/review with from..to target we can just use
target, and assume target..HEAD as the range. This makes it a lot
easier, as now you just have to say something like "devel/review
devel-2.1" if you're already on the branch you want to commit, and want
to commit it to devel-2.1.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
devel/review | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/devel/review b/devel/review
index 70cdf8144..97433e4e4 100755
--- a/devel/review
+++ b/devel/review
@@ -196,14 +196,31 @@ copy_commit() {
GIT_EDITOR="$me --commit-editor \"\$@\"" git commit -c "$rev" -s
}
-main() {
- local range="$1" target_branch="$2"
+usage() {
+ echo "Usage: $me_plain [from..to] <target-branch>" >&2
+ echo " If not passed from..to defaults to target-branch..HEAD" >&2
+ exit 1
+}
- if [[ -z "$target_branch" || "$range" != *..* ]]
- then
- echo "Usage: $me_plain <from..to> <target-branch>" >&2
- exit 1
- fi
+main() {
+ local range target_branch
+
+ case "$#" in
+ 1)
+ target_branch="$1"
+ range="$target_branch..$(git rev-parse HEAD)"
+ ;;
+ 2)
+ range="$1"
+ target_branch="$2"
+ if [[ "$range" != *..* ]]; then
+ usage
+ fi
+ ;;
+ *)
+ usage
+ ;;
+ esac
git checkout "$target_branch"
local old_head=$(git rev-parse HEAD)
--
GitLab