From: Michal Marek <mmarek@suse.cz>
Date: Thu, 21 May 2009 12:25:11 +0000 (+0200)
Subject: apply: handle filenames with double slashes better
X-Git-Tag: v1.6.4-rc0~97^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/33eb4dd9fce3b46b6962b46213d6f222bcd0cb3a?hp=33eb4dd9fce3b46b6962b46213d6f222bcd0cb3a

apply: handle filenames with double slashes better

When there are duplicated slashes in pathnames, like this:

--- a/perl//Git.pm
+++ b/perl//Git.pm
@@ -1358,3 +1358,4 @@

1; # Famous last words
+# test

the paths gleaned from the patch header won't be found in the index and
cause "apply --index" and "apply --cached" to fail.

Fix this by squashing the duplicated slashes upon input.

Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---