color-words: change algorithm to allow for 0-character word boundaries

diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh
index 80b5af2b412d3ecec20bc787261b44af363ea1d1..8f6aea48d84621ae3b7304636452c724a4bbe5b6 100755 (executable)
--- a/t/t4128-apply-root.sh
+++ b/t/t4128-apply-root.sh
@@ -8,7 +8,9 @@ test_expect_success 'setup' '
 
        mkdir -p some/sub/dir &&
        echo Hello > some/sub/dir/file &&
-       git add some/sub/dir/file
+       git add some/sub/dir/file &&
+       git commit -m initial &&
+       git tag initial
 
 '
 
@@ -21,12 +23,73 @@ diff a/bla/blub/dir/file b/bla/blub/dir/file
 +Bello
 EOF
 
-test_expect_success 'apply --root -p --index' '
+test_expect_success 'apply --directory -p (1)' '
 
-       git apply --root=some/sub -p3 --index patch &&
+       git apply --directory=some/sub -p3 --index patch &&
        test Bello = $(git show :some/sub/dir/file) &&
        test Bello = $(cat some/sub/dir/file)
 
 '
 
+test_expect_success 'apply --directory -p (2) ' '
+
+       git reset --hard initial &&
+       git apply --directory=some/sub/ -p3 --index patch &&
+       test Bello = $(git show :some/sub/dir/file) &&
+       test Bello = $(cat some/sub/dir/file)
+
+'
+
+cat > patch << EOF
+diff --git a/newfile b/newfile
+new file mode 100644
+index 0000000..d95f3ad
+--- /dev/null
++++ b/newfile
+@@ -0,0 +1 @@
++content
+EOF
+
+test_expect_success 'apply --directory (new file)' '
+       git reset --hard initial &&
+       git apply --directory=some/sub/dir/ --index patch &&
+       test content = $(git show :some/sub/dir/newfile) &&
+       test content = $(cat some/sub/dir/newfile)
+'
+
+cat > patch << EOF
+diff --git a/delfile b/delfile
+deleted file mode 100644
+index d95f3ad..0000000
+--- a/delfile
++++ /dev/null
+@@ -1 +0,0 @@
+-content
+EOF
+
+test_expect_success 'apply --directory (delete file)' '
+       git reset --hard initial &&
+       echo content >some/sub/dir/delfile &&
+       git add some/sub/dir/delfile &&
+       git apply --directory=some/sub/dir/ --index patch &&
+       ! (git ls-files | grep delfile)
+'
+
+cat > patch << 'EOF'
+diff --git "a/qu\157tefile" "b/qu\157tefile"
+new file mode 100644
+index 0000000..d95f3ad
+--- /dev/null
++++ "b/qu\157tefile"
+@@ -0,0 +1 @@
++content
+EOF
+
+test_expect_success 'apply --directory (quoted filename)' '
+       git reset --hard initial &&
+       git apply --directory=some/sub/dir/ --index patch &&
+       test content = $(git show :some/sub/dir/quotefile) &&
+       test content = $(cat some/sub/dir/quotefile)
+'
+
 test_done