Merge pull request #6 from chriscool/gpe-cr-improvements

Gpe cr improvements

Author: jbenet

git-push-each

@@ -1,9 +1,17 @@
 #!/bin/sh
 
 usage="USAGE
-    $0 [--clean] <remote> <branch-prefix>
+    $0 [--clean] [<remote> [<branch-prefix>]]
     push each commit from stdin to its own branch.
 
+DESCRIPTION
+    Read commit <sha1> hashes from stdin, one per line, and
+    for each one, push a branch to <remote>.
+    The branch is named following the <branch-prefix>-<sha1>
+    pattern and points to <sha1>.
+    By default <branch-prefix> is 'gpe-' and <remote> is
+    'origin'.
+
 OPTIONS
     --clean   delete all branches matching pattern:
               <branch-prefix><hash>
@@ -25,6 +33,12 @@ EXAMPLE
 # defaults
 remote="origin"
 prefix="gpe-"
+
+die() {
+	echo >&2 "$@"
+	exit 1
+}
+
 clean=0
 dryrun=0
 
@@ -42,7 +56,7 @@ while [ $# -gt 0 ]; do
 		dryrun=1
 		shift ;;
 	--*)
-		die "$(eval_gettext "unrecognised option: '\$arg'")" ;;
+		die "Unrecognised option: '$arg'\n$usage" ;;
 	*)
 		# get args
 		case "$#" in
@@ -54,29 +68,37 @@ while [ $# -gt 0 ]; do
 		1)
 			remote=$1
 			shift ;;
+		*)
+			die "Too many arguments: '$@'\n$usage" ;;
 		esac ;;
 	esac
 done
 
+test -n "$remote" || die "Empty <remote> argument\n$usage"
+test -n "$prefix" || die "Empty <branch-prefix> argument\n$usage"
+
 # clean up mode
 if [ $clean -eq 1 ]; then
-	spec="($prefix[0-9a-f]{40})"
-	for line in $(git branch -r | egrep -wo "$remote/$spec" | egrep -o "$spec")
+	spec="($prefix[0-9a-fA-F]{40})"
+	temp=$(mktemp) || die "mktemp failed"
+	git branch -r >"$temp" || die "Could not list remote branches"
+	for line in $(egrep -wo "$remote/$spec" "$temp" | egrep -o "$spec")
 	do
-	echo "git push $remote :$line"
-	if [ $dryrun -eq 0 ]; then
-		git push "$remote" ":$line"
-	fi
+		echo "git push $remote :$line"
+		if [ $dryrun -eq 0 ]; then
+			git push "$remote" ":$line" || die "Could not git push '$remote' ':$line'"
+		fi
 	done
+	rm "$temp"
 	exit 0
 fi
 
 # push mode
-for line in $(egrep -wo [0-9a-f]{40})
+for line in $(egrep -wo [0-9a-fA-F]{40})
 do
 	spec="$line:refs/heads/$prefix$line"
 	echo "git push $remote $spec"
 	if [ $dryrun -eq 0 ]; then
-		git push "$remote" "$spec"
+		git push "$remote" "$spec" || die "Could not git push '$remote' '$spec'"
 	fi
 done