-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Tue, 4 Nov 2014 12:23:33 +0100
Pierre-Yves Chibon <pingou(a)pingoured.fr> wrote:
---
roles/distgit/files/mkbranch | 94
++++++++++++++++++++++---------------------- 1 file changed, 47
insertions(+), 47 deletions(-)
diff --git a/roles/distgit/files/mkbranch
b/roles/distgit/files/mkbranch index 4e73495..29888a8 100644
--- a/roles/distgit/files/mkbranch
+++ b/roles/distgit/files/mkbranch
@@ -41,53 +41,53 @@ Usage:
The /master suffix on branch names is assumed.
Options:
- -s,--source=<src_branch> Use <src_branch> as the source
branch.
- Defaults is master
+ -s,--source=<src_branch> Use <src_branch> as the source
branch.
+ Defaults is master
/master suffix on other branches
assumed
- -n,--test Don't do nothing, only test
+ -n,--test Don't do nothing, only test
-i,--ignore Ignore erroneous modules
- -h,--help This help message
- -v,--verbose Increase verbosity
+ -h,--help This help message
+ -v,--verbose Increase verbosity
EOF
}
# parse the arguments
while [ -n "$1" ] ; do
case "$1" in
- -h | --help )
- Usage
- exit 0
- ;;
-
- -v | --verbose )
- VERBOSE=$(($VERBOSE + 1))
- ;;
-
- -i | --ignore )
- IGNORE="yes"
- ;;
-
- -n | --test )
- TEST="yes"
- ;;
-
- -s | --source )
- shift
- SRC_BRANCH=$1
- ;;
-
- -b | --branch )
- shift
- BRANCH=$1/master
- ;;
-
- * )
- if [ -z "$BRANCH" ] ; then
- BRANCH="$1"
- else
- PACKAGES="$PACKAGES $1"
- fi
- ;;
+ -h | --help )
+ Usage
+ exit 0
+ ;;
+
+ -v | --verbose )
+ VERBOSE=$(($VERBOSE + 1))
+ ;;
+
+ -i | --ignore )
+ IGNORE="yes"
+ ;;
+
+ -n | --test )
+ TEST="yes"
+ ;;
+
+ -s | --source )
+ shift
+ SRC_BRANCH=$1
+ ;;
+
+ -b | --branch )
+ shift
+ BRANCH=$1/master
+ ;;
+
+ * )
+ if [ -z "$BRANCH" ] ; then
+ BRANCH="$1"
+ else
+ PACKAGES="$PACKAGES $1"
+ fi
+ ;;
esac
shift
done
@@ -104,8 +104,8 @@ NEWP=
for p in $PACKAGES ; do
[ $VERBOSE -gt 1 ] && echo "Checking package $p..."
if [ ! -d $GITROOT/$p.git ] ; then
- echo "ERROR: Package module $p is invalid" >&2
- [ "$IGNORE" = "yes" ] && continue || exit -1
+ echo "ERROR: Package module $p is invalid" >&2
+ [ "$IGNORE" = "yes" ] && continue || exit -1
fi
if [ -z "$(GIT_DIR=$GITROOT/$p.git git rev-parse -q --verify
$SRC_BRANCH)" ] ; then \ echo "ERROR: Invalid source branch
'$SRC_BRANCH' for package $p" >&2; \ @@ -117,8 +117,8 @@ for p in
$PACKAGES ; do fi
$(GIT_DIR=$GITROOT/$p.git git rev-parse -q --verify \
$BRANCH >/dev/null) && \
- (echo "IGNORING: Package module $p already has a branch
$BRANCH" >&2; \
- [ "$IGNORE" = "yes" ] && continue || exit -1)
+ (echo "IGNORING: Package module $p already has a branch $BRANCH"
>&2; \
+ [ "$IGNORE" = "yes" ] && continue || exit -1)
NEWP="$NEWP $p"
done
PACKAGES="$(echo $NEWP)"
@@ -164,16 +164,16 @@ for NAME in $PACKAGES ; do
#[ $VERBOSE -gt 0 ] && echo "Creating $BRANCH-split tag for
$NAME/$SRC_BRANCH..." # Is the above needed?
#cvs -Q rtag -f "$BRANCH-split" $TOPLEVEL/$NAME/$SRC_BRANCH || {
- #echo "ERROR: Branch split tag for $NAME/$SRC_BRANCH could
not be created" >&2
- #exit -2
+ #echo "ERROR: Branch split tag for $NAME/$SRC_BRANCH could not
be created" >&2
+ #exit -2
#}
[ $VERBOSE -gt 0 ] && echo "Creating $NAME $BRANCH from $NAME
$SRC_BRANCH..." $(pushd $GITROOT/$NAME.git >/dev/null && \
git branch --no-track $BRANCH $SRC_BRANCH && \
popd >/dev/null) || {
- echo "ERROR: Branch $NAME $BRANCH could not be created" >&2
+ echo "ERROR: Branch $NAME $BRANCH could not be created" >&2
popd >/dev/null
- exit -2
+ exit -2
}
done
ACK
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJUtEjjAAoJEH7ltONmPFDRiC8P/jNjqdcI0MOUo24wc/fWj9Xh
Wdfv621DBpynOHcd7vGfpo0iJzS2PsXYezxdE3rxGpUpKjAgwrIyKrIP8aeM/cRL
hftStqvffW++EN0PYbJVHuZZoPYCgS97RQhUmPOf4ctfujWXHPOFzziNZgAXvFlZ
UO3s2UJGJ76nq3/DqdgVTahJYkpuUx/ICFwjIwEQgOVQdUXyX4idq50GGTaZ7dIJ
xKGR63dcCuiU7Zkbr8eMyXR8nHliy7U4nDdw2dof4osmgYcUnOvIPej7naarf3zX
ja+hWJWisFyJJ1KFXpBOwKB9HFHeUGWLyqUAF4tX8IOpppHCfUHYBZ4db+cfF3xI
XWANn06P4N1ph4Dj2X1aYwXDaDP9aCDkGI6n1PYNd2fKBxvsstUiafW2jrsk9r55
l/qnl/JPWeOhHfAWQzQ+Jvcrd344P7n1DE4cN18vBRSWuaeIoA9yrjvmDaBy6md2
DISHV+A0bRHbpmr2aoZ/46BTnbfP8kbZKmpNO7JuFk4KC/+2bbIbWFoQ6TDJNbQz
03+IPbVU22k7BTJItrwYQVBf5pT1fE1ED6BFi5NnKngvTdt2RyAKGOwDXqBDHJH5
Qu7GKnnGrXt4C5dlugdMR7QoYCqj/dsfQ+rSCu9gTqOp4A/UP5pjaogMwgR074qI
7MDqGJlJkFRT0AuXfckY
=PNCC
-----END PGP SIGNATURE-----