Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

diff --git a/ls-files.c b/ls-files.c
index 56f3919e069eb7390ff1f06ff25a0cc9c420e8a8..0d79104e0dd16c77c10a7db43c1afce3fc733160 100644 (file)
--- a/ls-files.c
+++ b/ls-files.c
@@ -496,7 +496,7 @@ static void verify_pathspec(void)
                        char c = n[i];
                        if (prev && prev[i] != c)
                                break;
-                       if (c == '*' || c == '?')
+                       if (!c || c == '*' || c == '?')
                                break;
                        if (c == '/')
                                len = i+1;