From 94029ce1420ced83c3e5dcd181a2280b26574bc9 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 15 Oct 2010 12:53:14 +0200 Subject: Adjusted regex to support whitespace - it was a little restrictive previously, although there was absolutely no need for that. See http://byronimo.lighthouseapp.com/projects/51787/tickets/41-diff-regex-lib_git_diffpy-cannot-handle-paths-with-spaces --- lib/git/diff.py | 2 +- test/fixtures/diff_2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/git/diff.py b/lib/git/diff.py index e1749adc..48253c42 100644 --- a/lib/git/diff.py +++ b/lib/git/diff.py @@ -175,7 +175,7 @@ class Diff(object): # precompiled regex re_header = re.compile(r""" #^diff[ ]--git - [ ]a/(?P\S+)[ ]b/(?P\S+)\n + [ ]a/(?P.+?)[ ]b/(?P.+?)\n (?:^similarity[ ]index[ ](?P\d+)%\n ^rename[ ]from[ ](?P\S+)\n ^rename[ ]to[ ](?P\S+)(?:\n|$))? diff --git a/test/fixtures/diff_2 b/test/fixtures/diff_2 index 1f060c70..218b6bae 100644 --- a/test/fixtures/diff_2 +++ b/test/fixtures/diff_2 @@ -1,7 +1,7 @@ diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb index a093bb1db8e884cccf396b297259181d1caebed4..80fd3d527f269ecbd570b65b8e21fd85baedb6e9 100644 ---- a/lib/grit/commit.rb -+++ b/lib/grit/commit.rb +--- a/lib/grit/com mit.rb ++++ b/lib/grit/com mit.rb @@ -156,12 +156,8 @@ module Grit def diffs -- cgit v1.2.3