[Quilt-dev] address@hidden: Bug#298785: Quilt refresh --diffstat strips prefixes]

[Martin Quinson]

Hello there,

I just received the following request through the debian BTS. The patch
sounds quite sensible to me. Does anyone have an objection, or can I commit
it?

Thanks, Mt.

ps: please keep both the ML and the bug in CC.

----- Forwarded message from Peter Chubb <address@hidden> -----

Subject: Bug#298785: Quilt refresh --diffstat strips prefixes
X-Debian-PR-Package: quilt
Date: Thu, 10 Mar 2005 09:35:34 +1100
From: Peter Chubb <address@hidden>
To: address@hidden
X-Mailer: VM 7.17 under 21.4 (patch 17) "Jumbo Shrimp" XEmacs Lucid


Package: quilt
Version: 0.39-1
Tag: Patch

I'm using quilt to maintain patches for delivery to the Linux Kernel.
I like to maintain a diffstat in each patch.  However, the current
diffstat (1.35-1) by default strips common file prefixes, so if, for
example, I've altered arch/ia64/mm/fault.c and arch/ia64/mm/numa.c
they show up in the diffstat as fault.c and numa.c

This isn't really acceptable when the patch is mailed off to LKML.

The appended patch calls diffstat with the -p 1 option, so that the
diffstat puts in an appropriate unambiguous name.

- --- quilt-0.39/quilt/refresh.in.orig  2005-03-10 09:23:08.790510382 +1100
+++ quilt-0.39/quilt/refresh.in 2005-03-10 09:23:33.801981945 +1100
@@ -209,7 +209,7 @@
 
 if [ -n "$opt_diffstat" ]
 then
- -     diffstat="$(@DIFFSTAT@ $tmp_patch)" || die 1
+       diffstat="$(@DIFFSTAT@ -p 1 $tmp_patch)" || die 1
        @AWK@ '
            function print_diffstat(arr, i) {
              split(diffstat, arr, "\n")


---End encapsulation




----- End forwarded message -----

signature.asc
Description: Digital signature