undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

entry.c: remove "checkout-index" from error messages

Browse Source 
Back then when entry.c was part of checkout-index (or checkout-cache
at that time [1]). It makes sense to print the command name in error
messages. Nowadays entry.c is in libgit and can be used by any
commands, printing "git checkout-index: blah" does no more than
confusion. The error messages without it still give enough information.

[1] 12dccc1 (Make fiel checkout function available to the git library - 2005-06-05)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2010-11-28 11:36:38 +07:00 committed by Junio C Hamano
parent 16529f2e56
commit d43e90732b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
entry.c
View File

@ -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;
}