aboutsummaryrefslogtreecommitdiff
path: root/read-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-15 21:45:38 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-15 21:45:38 -0700
commitf5cabd13d814bb5c547a13af03bcc42122531141 (patch)
tree6795adc096e36c7a7f8e6a407297727e61d4d083 /read-tree.c
parent13e897e58072678cdae3ec1db51cc91110dc559d (diff)
downloadgit-f5cabd13d814bb5c547a13af03bcc42122531141.tar.gz
git-f5cabd13d814bb5c547a13af03bcc42122531141.tar.xz
Encode a few extra flags per index entry.
This will allow us to have the same name in different "states" in the index at the same time. Which in turn seems to be a very simple way to merge.
Diffstat (limited to 'read-tree.c')
-rw-r--r--read-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/read-tree.c b/read-tree.c
index 5c6588da4..7ee1275b0 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -14,7 +14,7 @@ static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
memset(ce, 0, size);
ce->ce_mode = htonl(mode);
- ce->ce_namelen = htons(baselen + len);
+ ce->ce_flags = htons(baselen + len);
memcpy(ce->name, base, baselen);
memcpy(ce->name + baselen, pathname, len+1);
memcpy(ce->sha1, sha1, 20);