summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-14 01:41:02 -0700
committerJunio C Hamano <gitster@pobox.com>2007-08-14 23:19:10 -0700
commit1a9d7e9b484e77436edc7f5cacd39c24ec605e6d (patch)
tree3492597bfe86cd1f650d78fa21cf7dbe0e5bd91f /entry.c
parenta44131181a13eb599ed35647709692b1699706eb (diff)
downloadgit-1a9d7e9b484e77436edc7f5cacd39c24ec605e6d.tar.gz
attr.c: read .gitattributes from index as well.
This makes .gitattributes files to be read from the index when they are not checked out to the work tree. This is in line with the way we always allowed low-level tools to operate in sparsely checked out work tree in a reasonable way. It swaps the order of new file creation and converting the blob to work tree representation; otherwise when we are in the middle of checking out .gitattributes we would notice an empty but unwritten .gitattributes file in the work tree and will ignore the copy in the index. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'entry.c')
-rw-r--r--entry.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/entry.c b/entry.c
index 0625112339..fc3a506ece 100644
--- a/entry.c
+++ b/entry.c
@@ -112,6 +112,16 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
if (!new)
return error("git-checkout-index: unable to read sha1 file of %s (%s)",
path, sha1_to_hex(ce->sha1));
+
+ /*
+ * Convert from git internal format to working tree format
+ */
+ buf = convert_to_working_tree(ce->name, new, &size);
+ if (buf) {
+ free(new);
+ new = buf;
+ }
+
if (to_tempfile) {
strcpy(path, ".merge_file_XXXXXX");
fd = mkstemp(path);
@@ -123,15 +133,6 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
path, strerror(errno));
}
- /*
- * Convert from git internal format to working tree format
- */
- buf = convert_to_working_tree(ce->name, new, &size);
- if (buf) {
- free(new);
- new = buf;
- }
-
wrote = write_in_full(fd, new, size);
close(fd);
free(new);