projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-rerere.txt: grammatical fixups and cleanups
[git.git]
/
entry.c
diff --git
a/entry.c
b/entry.c
index 222aaa374b8268828e9d529a8afacb8830acc281..aa2ee46a84033585d8e07a585610c5a697af82c2 100644
(file)
--- a/
entry.c
+++ b/
entry.c
@@
-111,7
+111,7
@@
static int write_entry(struct cache_entry *ce, char *path, const struct checkout
case S_IFREG:
new = read_blob_entry(ce, path, &size);
if (!new)
case S_IFREG:
new = read_blob_entry(ce, path, &size);
if (!new)
- return error("git
-
checkout-index: unable to read sha1 file of %s (%s)",
+ return error("git
checkout-index: unable to read sha1 file of %s (%s)",
path, sha1_to_hex(ce->sha1));
/*
path, sha1_to_hex(ce->sha1));
/*
@@
-132,7
+132,7
@@
static int write_entry(struct cache_entry *ce, char *path, const struct checkout
fd = create_file(path, ce->ce_mode);
if (fd < 0) {
free(new);
fd = create_file(path, ce->ce_mode);
if (fd < 0) {
free(new);
- return error("git
-
checkout-index: unable to create file %s (%s)",
+ return error("git
checkout-index: unable to create file %s (%s)",
path, strerror(errno));
}
path, strerror(errno));
}
@@
-140,12
+140,12
@@
static int write_entry(struct cache_entry *ce, char *path, const struct checkout
close(fd);
free(new);
if (wrote != size)
close(fd);
free(new);
if (wrote != size)
- return error("git
-
checkout-index: unable to write file %s", path);
+ return error("git
checkout-index: unable to write file %s", path);
break;
case S_IFLNK:
new = read_blob_entry(ce, path, &size);
if (!new)
break;
case S_IFLNK:
new = read_blob_entry(ce, path, &size);
if (!new)
- return error("git
-
checkout-index: unable to read sha1 file of %s (%s)",
+ return error("git
checkout-index: unable to read sha1 file of %s (%s)",
path, sha1_to_hex(ce->sha1));
if (to_tempfile || !has_symlinks) {
if (to_tempfile) {
path, sha1_to_hex(ce->sha1));
if (to_tempfile || !has_symlinks) {
if (to_tempfile) {
@@
-155,31
+155,31
@@
static int write_entry(struct cache_entry *ce, char *path, const struct checkout
fd = create_file(path, 0666);
if (fd < 0) {
free(new);
fd = create_file(path, 0666);
if (fd < 0) {
free(new);
- return error("git
-
checkout-index: unable to create "
+ return error("git
checkout-index: unable to create "
"file %s (%s)", path, strerror(errno));
}
wrote = write_in_full(fd, new, size);
close(fd);
free(new);
if (wrote != size)
"file %s (%s)", path, strerror(errno));
}
wrote = write_in_full(fd, new, size);
close(fd);
free(new);
if (wrote != size)
- return error("git
-
checkout-index: unable to write file %s",
+ return error("git
checkout-index: unable to write file %s",
path);
} else {
wrote = symlink(new, path);
free(new);
if (wrote)
path);
} else {
wrote = symlink(new, path);
free(new);
if (wrote)
- return error("git
-
checkout-index: unable to create "
+ return error("git
checkout-index: unable to create "
"symlink %s (%s)", path, strerror(errno));
}
break;
case S_IFGITLINK:
if (to_tempfile)
"symlink %s (%s)", path, strerror(errno));
}
break;
case S_IFGITLINK:
if (to_tempfile)
- return error("git
-
checkout-index: cannot create temporary subproject %s", path);
+ return error("git
checkout-index: cannot create temporary subproject %s", path);
if (mkdir(path, 0777) < 0)
if (mkdir(path, 0777) < 0)
- return error("git
-
checkout-index: cannot create subproject directory %s", path);
+ return error("git
checkout-index: cannot create subproject directory %s", path);
break;
default:
break;
default:
- return error("git
-
checkout-index: unknown file mode for %s", path);
+ return error("git
checkout-index: unknown file mode for %s", path);
}
if (state->refresh_cache) {
}
if (state->refresh_cache) {