Merge refs/heads/master from .

diff --git a/git-checkout-script b/git-checkout-script
index a37740713ed747a18b7ee5415e41e5bd57834c48..9feff149acc87326e13f96db17257235e78c42db 100755 (executable)
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -72,4 +72,6 @@ if [ "$?" -eq 0 ]; then
        fi
        [ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
        rm -f "$GIT_DIR/MERGE_HEAD"
+else
+       exit 1
 fi

diff --git a/ls-files.c b/ls-files.c
index 2c7aada88cc582dfee7ba19d1e6ae717e23d8e03..e53d245884ab14f85824fd6c1b891481c8b1f849 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;