From ab712f2ed92a6e451bf2d482b03d2559697bf100 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@suse.cz>
Date: Sun, 3 Aug 2008 20:18:04 +0200
Subject: [PATCH] tg-create.sh: Change usage (-d -> arguments)

As suggested on IRC (I think by doener), it is more in the Git usage
spirit for tg create to take the patch dependencies as extra arguments
instead of -d parameter argument.
---
 README       | 14 +++++---------
 tg-create.sh | 10 ++++++----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/README b/README
index be7be1b..dc2e5ff 100644
--- a/README
+++ b/README
@@ -86,9 +86,9 @@ SYNOPSIS
 	$ ..hack..
 	$ git commit
 
-	## Create another topic branch on top of specified one and submit
+	## Create another topic branch on top of master and submit
 	## the resulting patch upstream
-	$ tg create -d master t/revlist/author-fixed
+	$ tg create t/revlist/author-fixed master
 	tg: Creating t/revlist/author-fixed base from master...
 	$ ..hack..
 	$ git commit
@@ -100,7 +100,7 @@ SYNOPSIS
 	Subject: [PATCH] Fix broken revlist --author when --fixed-string
 
 	## Create another topic branch depending on two others non-trivially
-	$ tg create -d t/revlist/author-fixed,t/gitweb/nifty-links t/whatever
+	$ tg create t/whatever t/revlist/author-fixed t/gitweb/nifty-links
 	tg: Creating t/whatever base from t/revlist/author-fixed...
 	tg: Merging t/whatever base with t/gitweb/nifty-links...
 	Merge failed!
@@ -199,8 +199,8 @@ tg create
 ~~~~~~~~~
 	Create a new TopGit-controlled topic branch of a given name
 	(required argument) and switch to it. If no dependencies
-	are specified using the '-d' paremeter, the current branch
-	is assumed to be the only dependency.
+	are specified (by extra arguments passed after the first one),
+	the current branch is assumed to be the only dependency.
 
 	After `tg create`, you should insert the patch description
 	to the '.topmsg' file.
@@ -212,10 +212,6 @@ tg create
 	it will detect that you are on a topic branch base ref and
 	resume the topic branch creation operation.
 
-	'-d':
-		Manually specified dependencies. A comma- or
-		space-separated list of branch names.
-
 tg delete
 ~~~~~~~~~
 	Remove a TopGit-controlled topic branch of given name
diff --git a/tg-create.sh b/tg-create.sh
index 30c69c9..0db1cf3 100644
--- a/tg-create.sh
+++ b/tg-create.sh
@@ -14,20 +14,22 @@ name=
 while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
-	-d)
-		deps="$(echo "$1" | sed 's/,/ /g')"; shift;;
 	-*)
 		echo "Usage: tg create [-d DEPS...] NAME" >&2
 		exit 1;;
 	*)
-		[ -z "$name" ] || die "name already specified ($name)"
-		name="$arg";;
+		if [ -z "$name" ]; then
+			name="$arg"
+		else
+			deps="$deps $arg"
+		fi;;
 	esac
 done
 
 
 ## Auto-guess dependencies
 
+deps="${deps# }"
 if [ -z "$deps" ]; then
 	head="$(git symbolic-ref HEAD)"
 	bname="${head#refs/top-bases/}"
-- 
2.11.4.GIT