diff options
| -rw-r--r-- | bin/quilt.in | 5 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/quilt.in b/bin/quilt.in index 7211002..76ae15b 100644 --- a/bin/quilt.in +++ b/bin/quilt.in @@ -163,7 +163,10 @@ if [ -n "$QUILT_COMMAND" ]; then unset args fi -bash $BASH_OPTS -c ". $QUILT_DIR/$command" "quilt ${command##*/}" "$@" +if [ -n "$BASH_OPTS" ]; then + set $BASH_OPTS +fi +. "$QUILT_DIR/$command" ### Local Variables: ### mode: shell-script ### End: diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 5c8e919..75cee52 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -28,11 +28,6 @@ fi unset CDPATH shopt -s dotglob -if [ -e "$QUILTRC" ] -then - source "$QUILTRC" -fi - . $QUILT_DIR/scripts/utilfns # ======================================================== @@ -1079,8 +1074,10 @@ quilt_command() # the command line export QUILT_NO_DIFF_INDEX export QUILT_NO_DIFF_TIMESTAMPS + # Propagate tracing options in case we are called recursively + export BASH_OPTS - QUILT_COMMAND="" bash $BASH_OPTS -c "${SUBDIR:+cd $SUBDIR;} . $QUILT_DIR/$command" "quilt $command" "$@" + QUILT_COMMAND="" bash $BASH_OPTS -c "${SUBDIR:+cd $SUBDIR;} [ ! -e \"$QUILTRC\" ] || source \"$QUILTRC\"; . $QUILT_DIR/$command" "quilt $command" "$@" } check_external_tool() |