summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2003-01-30 16:12:49 +0000
committerAndreas Gruenbacher <agruen@suse.de>2003-01-30 16:12:49 +0000
commita3f2faa3f909a4f95367815d68d749c6c25a6596 (patch)
tree215b80d7f0a5caa068439a32454bae642238445a
parenta12dc9e53eb69300f130b20765bf859f956b308d (diff)
downloadquilt-a3f2faa3f909a4f95367815d68d749c6c25a6596.tar.gz
Add changelog and fix patch_description for "Index:" lines in patches
-rw-r--r--lib/patchfns.in14
-rw-r--r--quilt.changes5
2 files changed, 12 insertions, 7 deletions
diff --git a/lib/patchfns.in b/lib/patchfns.in
index 463fb30..b6dd5cf 100644
--- a/lib/patchfns.in
+++ b/lib/patchfns.in
@@ -585,13 +585,13 @@ patch_description()
if [ -e "$patch_file" ]
then
awk '
- /^--- / { exit }
- diff_line { print diff_line
- diff_line=""
- }
- /^diff / { diff_line=$0
- next
- }
+ $1 == "---" { exit }
+ $1 == "Index:" { eat = eat $0
+ next }
+ $1 == "diff" { eat = eat $0
+ next }
+ eat { print eat
+ eat="" }
{ print }
' $patch_file
fi
diff --git a/quilt.changes b/quilt.changes
index a2493a4..9c6cc55 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -6,6 +6,11 @@ Thu Jan 30 13:25:51 CET 2003 - agruen@suse.de
@PATCH@ in scripts.
- Some cleanups in Makefile.
- Move documentation to doc/.
+- Forgot to mention that the patches produced now contain
+ `Index: dir/filename' just before the diff output for each file.
+ This is required by POSIX, and is also used by diffstat.
+- Adjust patch_description documentation extraction function to
+ check for Index: lines.
-------------------------------------------------------------------
Tue Jan 28 23:41:19 CET 2003 - agruen@suse.de