X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/5a30e78c803f59d6b134dea657d90ebb42ea3b3a..850c3a89476ba8608b2deeba109fa7def2607655:/contrib/stg-dispatch diff --git a/contrib/stg-dispatch b/contrib/stg-dispatch index 8911946..e9cfb05 100755 --- a/contrib/stg-dispatch +++ b/contrib/stg-dispatch @@ -6,7 +6,7 @@ set -e # do so), but from the patch containing the changes to migrate, # instead of doing so from the target patch. -# usage: stg-dispatch [-#[-][,]...] +# usage: stg-dispatch [-n] [-#[-][,]...] # Copyright (c) 2007 Yann Dirson # Subject to the GNU GPL, version 2. @@ -17,6 +17,12 @@ die() exit 1 } +noact=0 +if [ "x$1" = "x-n" ]; then + noact=1 + shift +fi + TOPATCH="$1" shift @@ -28,7 +34,11 @@ CURRENTPATCH=$(stg top) [ "x$TOPATCH" != "x$CURRENTPATCH" ] || die "dispatching to current patch ($CURRENTPATCH) makes no sense" -stg goto "$TOPATCH" -stg-fold-files-from "$CURRENTPATCH" "$@" -stg refresh -stg goto "$CURRENTPATCH" +if [ $noact = 1 ]; then + stg-fold-files-from "$CURRENTPATCH" -n "$@" +else + stg goto "$TOPATCH" + stg-fold-files-from "$CURRENTPATCH" "$@" + stg refresh + stg goto "$CURRENTPATCH" +fi