From ac5b4a80b959199a26104a5fffeda4c5d86bdc28 Mon Sep 17 00:00:00 2001 From: lace <> Date: Thu, 10 Jul 2008 10:32:19 +0000 Subject: [PATCH] Support also non-CVS diff toplevel dir normalization to `./'. --- bin/diffdecvs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/diffdecvs b/bin/diffdecvs index 7b65e6d..0fd5082 100755 --- a/bin/diffdecvs +++ b/bin/diffdecvs @@ -10,8 +10,8 @@ prog=' $wasdiff-- if $wasdiff; $wasdiff=3 if /^diff -/; # Do not substitute already existing "./"... or "/dev/null". - s{^\Q---\E (?![.]?/)}{$&./} if $wasdiff==2; - s{^\Q+++\E (?![.]?/)}{$&./} if $wasdiff==1; + s{^(\Q---\E )(?:gdb-[^/]*/|[.]/)?}{$1./} if $wasdiff==2; + s{^(\Q+++\E )(?:gdb-[^/]*/|[.]/)?}{$1./} if $wasdiff==1; next if /^[?]/; next if /^Index:/; next if /^={67}$/; -- 1.8.3.1