magic pathspec: add tentative ":/path/from/top/level" pathspec support

diff --git a/entry.c b/entry.c
index 004182c99d27a6a5825d2429f9104fc7a8f1dc80..b017167f2015623fb9c721e91d0a940abd1d5196 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -106,14 +106,14 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
        case S_IFLNK:
                new = read_blob_entry(ce, &size);
                if (!new)
-                       return error("git checkout-index: unable to read sha1 file of %s (%s)",
+                       return error("unable to read sha1 file of %s (%s)",
                                path, sha1_to_hex(ce->sha1));
 
                if (ce_mode_s_ifmt == S_IFLNK && has_symlinks && !to_tempfile) {
                        ret = symlink(new, path);
                        free(new);
                        if (ret)
-                               return error("git checkout-index: unable to create symlink %s (%s)",
+                               return error("unable to create symlink %s (%s)",
                                             path, strerror(errno));
                        break;
                }
@@ -141,7 +141,7 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
                }
                if (fd < 0) {
                        free(new);
-                       return error("git checkout-index: unable to create file %s (%s)",
+                       return error("unable to create file %s (%s)",
                                path, strerror(errno));
                }
 
@@ -155,16 +155,16 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
                close(fd);
                free(new);
                if (wrote != size)
-                       return error("git checkout-index: unable to write file %s", path);
+                       return error("unable to write file %s", path);
                break;
        case S_IFGITLINK:
                if (to_tempfile)
-                       return error("git checkout-index: cannot create temporary subproject %s", path);
+                       return error("cannot create temporary subproject %s", path);
                if (mkdir(path, 0777) < 0)
-                       return error("git checkout-index: cannot create subproject directory %s", path);
+                       return error("cannot create subproject directory %s", path);
                break;
        default:
-               return error("git checkout-index: unknown file mode for %s", path);
+               return error("unknown file mode for %s in index", path);
        }
 
        if (state->refresh_cache) {
@@ -211,7 +211,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *t
                        return 0;
                if (!state->force) {
                        if (!state->quiet)
-                               fprintf(stderr, "git-checkout-index: %s already exists\n", path);
+                               fprintf(stderr, "%s already exists, no checkout\n", path);
                        return -1;
                }