patch: make -p count path components, not slashes (think /blah//thing)
Signed-off-by: Rob Landley <rob@landley.net> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
committed by
Denys Vlasenko
parent
cc87588a61
commit
39ec6a2ad5
@@ -226,6 +226,22 @@ qwerty
|
||||
+qwerty
|
||||
"
|
||||
|
||||
# testing "test name" "command(s)" "expected result" "file input" "stdin"
|
||||
testing "patch understands ...dir///dir..." \
|
||||
'patch -p1 2>&1; echo $?' \
|
||||
"\
|
||||
patching file dir2///file
|
||||
patch: can't open 'dir2///file': No such file or directory
|
||||
1
|
||||
" "" "\
|
||||
--- bogus_dir///dir2///file
|
||||
+++ bogus_dir///dir2///file
|
||||
@@ -1,2 +1,3 @@
|
||||
qwe
|
||||
+asd
|
||||
zxc
|
||||
"
|
||||
|
||||
rm input.orig 2>/dev/null
|
||||
|
||||
exit $FAILCOUNT
|
||||
|
Reference in New Issue
Block a user