summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-27 22:50:10 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-27 22:50:10 (GMT)
commit767e130915015f897fb87b939843b4882212574b (patch)
tree4a00aa0e76a534828dc0b6638e1d87f82e2f404a
parentb3bf974cab4569221b5a1249d1a692e7190896f8 (diff)
parent2111168f314ac4f53932b8bbb16191a3855f5b6f (diff)
downloadgit-767e130915015f897fb87b939843b4882212574b.zip
git-767e130915015f897fb87b939843b4882212574b.tar.gz
git-767e130915015f897fb87b939843b4882212574b.tar.bz2
Merge fixes up to GIT 1.1.5
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--entry.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/entry.c b/entry.c
index 410b758..6c47c3a 100644
--- a/entry.c
+++ b/entry.c
@@ -70,7 +70,6 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
unsigned long size;
long wrote;
char type[20];
- char target[1024];
new = read_sha1_file(ce->sha1, type, &size);
if (!new || strcmp(type, "blob")) {
@@ -94,12 +93,10 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
return error("git-checkout-index: unable to write file %s", path);
break;
case S_IFLNK:
- memcpy(target, new, size);
- target[size] = '\0';
- if (symlink(target, path)) {
+ if (symlink(new, path)) {
free(new);
- return error("git-checkout-index: unable to create symlink %s (%s)",
- path, strerror(errno));
+ return error("git-checkout-index: unable to create "
+ "symlink %s (%s)", path, strerror(errno));
}
free(new);
break;