forked from pool/quilt
e1c9c765c9
o Option -E is no longer passed to patch by default
o Return 2 when there is nothing to do, contrasting with errors
(ret=1)
o Exit with an error when diff's retcode=2 (error) on patch
refresh
o bash_completion: cleanups and performance improvement
(Savannah's #27111)
o Add some tests to our testsuite, for a better coverage
o Bug fix: Patches emptying files should work now
o Bug fix: Check for duplicate patch in series (Savannah's
#20628)
o Obsoletes quilt-bash_completion-fix-completion-of-patch-names.patch
o Obsoletes quilt-boost-the-speed-of-series-applied-and-unapplied.patch
o Obsoletes quilt-enable-patch-wrapper-test.patch
o Obsoletes quilt-files-return-nothing-if-there-are-no-files.patch
o Obsoletes quilt-fix-quilt-diff-z-on-files-with-spaces-in-name.patch
o Obsoletes quilt-patches-fix-heuristic-for-unapplied-patches-with-timestamps.patch
o Obsoletes quilt-patches-optimize-processing-of-unapplied-patches.patch
o Obsoletes quilt-patches-optimize-the-multiple-files-case.patch
o Obsoletes quilt-refresh-fix-error-message.patch
- Refresh patch-wrapper-rpm.diff
- Refresh quilt-support-vimdiff.patch
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=82
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From: Jean Delvare <jdelvare@suse.de>
|
|
Subject: Fix interaction between quilt and vimdiff
|
|
References: bnc#749563
|
|
|
|
Using vimdiff as a diff viewer in quilt breaks if QUILT_PAGER is set.
|
|
So inhibit the pager in that case. Other diff viewers may be affected
|
|
as well but I don't know how to fix this in a generic way, short of
|
|
inhibiting the pager as soon as option --diff is passed to the diff
|
|
command. Not sure if this desirable though, as I presume
|
|
non-interactive alternative diff viewers must exist too.
|
|
---
|
|
quilt/diff.in | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
--- a/quilt/diff.in
|
|
+++ b/quilt/diff.in
|
|
@@ -66,7 +66,9 @@ included.
|
|
|
|
--diff=utility
|
|
Use the specified utility for generating the diff. The utility
|
|
- is invoked with the original and new file name as arguments.
|
|
+ is invoked with the original and new file name as arguments. If
|
|
+ using an interactive text-mode diff viewer that is not known to
|
|
+ quilt, you will have to unset QUILT_PAGER for proper result.
|
|
|
|
--color[=always|auto|never]
|
|
Use syntax coloring (auto activates it only if the output is a tty).
|
|
@@ -219,6 +221,13 @@ done
|
|
|
|
QUILT_DIFF_OPTS="$QUILT_DIFF_OPTS $opt_format"
|
|
|
|
+# Inhibit pager for interactive text-mode diff viewers
|
|
+case "$(basename $opt_diff)" in
|
|
+vimdiff)
|
|
+ QUILT_PAGER=
|
|
+ ;;
|
|
+esac
|
|
+
|
|
opt_files=( $(for file in "$@"; do echo "$SUBDIR${file#./}" ; done) )
|
|
|
|
if [ $[0$opt_combine + 0$opt_snapshot + 0$opt_relative] -gt 1 ]
|