2014-10-01 14:15:16 +02:00
|
|
|
From: Jean Delvare <jdelvare@suse.de>
|
|
|
|
|
Subject: Allow patch format options to pass through
|
2015-01-28 11:58:31 +01:00
|
|
|
Upstream: Committed (5fd023e14932bd01dbd5cbd6636a7ea5531c5d40)
|
2014-10-01 14:15:16 +02:00
|
|
|
|
|
|
|
|
In order to make "quilt_command refresh" work properly, we must ensure
|
|
|
|
|
that format options are passed through.
|
|
|
|
|
---
|
|
|
|
|
quilt/scripts/patchfns.in | 5 +++++
|
|
|
|
|
1 file changed, 5 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/quilt/scripts/patchfns.in
|
|
|
|
|
+++ b/quilt/scripts/patchfns.in
|
|
|
|
|
@@ -976,6 +976,11 @@ quilt_command()
|
|
|
|
|
local command=$1
|
|
|
|
|
shift
|
|
|
|
|
|
|
|
|
|
+ # Refreshing here must produce the same output as "quilt refresh" on
|
|
|
|
|
+ # the command line
|
|
|
|
|
+ export QUILT_NO_DIFF_INDEX
|
|
|
|
|
+ export QUILT_NO_DIFF_TIMESTAMPS
|
|
|
|
|
+
|
|
|
|
|
QUILT_COMMAND="" bash $BASH_OPTS -c "${SUBDIR:+cd $SUBDIR;} . $QUILT_DIR/$command" "quilt $command" "$@"
|
|
|
|
|
}
|
|
|
|
|
|
