Hi all,
Back in July 2004, the -n flag of six quilt commands was dropped in
favor of a global switch QUILT_PATCHES_PREFIX in .quiltrc. However, the
current code still has remnants of the old method. The "patches" and
"previous" commands accept the -n flag (but silently ignore it), and
bash completion still suggests -n as a possible flag for all six
commands.
The attached patch fixes this, please apply.
Thanks,
--
Jean Delvare
Index: bash_completion
===================================================================
RCS file: /cvsroot/quilt/quilt/bash_completion,v
retrieving revision 1.13
diff -u -r1.13 bash_completion
--- bash_completion 8 Jun 2005 20:40:54 -0000 1.13
+++ bash_completion 11 Jun 2005 07:14:54 -0000
@@ -132,7 +132,7 @@
esac
;;
applied)
- COMPREPLY=( $( compgen -W "-n -h $(quilt applied)" -- $cur ) )
+ COMPREPLY=( $( compgen -W "-h $(quilt applied)" -- $cur ) )
;;
delete)
COMPREPLY=( $( compgen -W "-h $(quilt series)" -- $cur ) )
@@ -197,11 +197,11 @@
new)
;;
next|previous)
- COMPREPLY=( $( compgen -W "-n $(quilt series)" -- $cur ) )
+ COMPREPLY=( $( compgen -W "$(quilt series)" -- $cur ) )
;;
patches)
_quilt_comfile
- COMPREPLY=( [EMAIL PROTECTED]:-} $( compgen -W "-v -n -h" -- $cur ) )
+ COMPREPLY=( [EMAIL PROTECTED]:-} $( compgen -W "-v -h" -- $cur ) )
;;
pop)
COMPREPLY=( $( compgen -W "-a -f -R -q -v -h $(quilt applied)" --
$cur ) )
@@ -241,7 +241,7 @@
esac
;;
series)
- COMPREPLY=( $( compgen -W "-n -v -h" -- $cur ) )
+ COMPREPLY=( $( compgen -W "-v -h" -- $cur ) )
;;
setup)
case $prev in
@@ -260,7 +260,7 @@
top)
;;
unapplied)
- COMPREPLY=( $( compgen -W "-n -h $(quilt series)" -- $cur ) )
+ COMPREPLY=( $( compgen -W "-h $(quilt series)" -- $cur ) )
;;
upgrade)
;;
Index: quilt/patches.in
===================================================================
RCS file: /cvsroot/quilt/quilt/quilt/patches.in,v
retrieving revision 1.16
diff -u -r1.16 patches.in
--- quilt/patches.in 8 Nov 2004 12:07:10 -0000 1.16
+++ quilt/patches.in 11 Jun 2005 07:14:54 -0000
@@ -66,7 +66,7 @@
done
}
-options=`getopt -o nvh -- "$@"`
+options=`getopt -o vh -- "$@"`
if [ $? -ne 0 ]
then
Index: quilt/previous.in
===================================================================
RCS file: /cvsroot/quilt/quilt/quilt/previous.in,v
retrieving revision 1.13
diff -u -r1.13 previous.in
--- quilt/previous.in 9 Jul 2004 07:26:34 -0000 1.13
+++ quilt/previous.in 11 Jun 2005 07:14:54 -0000
@@ -32,7 +32,7 @@
fi
}
-options=`getopt -o nh -- "$@"`
+options=`getopt -o h -- "$@"`
if [ $? -ne 0 ]
then
_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev
