For the --cc (compressed combined) diff output there can be patches
which are simple and got simplified out, so there is no patch
corresponding to raw output line.
Fix detection of of such simplified out patches: file name in git diff
header for --cc diff can be quoted; unquote it.
Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
---
This patch depends _textually_ on the just send
"gitweb: Fix and simplify "split patch" detection"
patch, although it is _conceptually_ independent.
The commit message could be better...
gitweb/gitweb.perl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 8c1e02c..5d424e5 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3140,8 +3140,8 @@ sub git_patchset_body {
# compact combined diff output can have some patches skipped
# find which patch (using pathname of result) we are at now
my $to_name;
- if ($patch_line =~ m!^diff --cc "?(.*)"?$!) {
- $to_name = $1;
+ if ($patch_line =~ m!^diff --cc ("?.*"?)$!) {
+ $to_name = unquote($1);
}
do {
--
1.5.2.5
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
