diff options
| author |  Brandon Casey <drafnel@gmail.com> | 2008-11-12 11:59:03 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-11-12 10:28:08 -0800 |
| commit | 8d25931d6ff47a7fb06512d767d1d416d9bc7733 (patch) | |
| tree | 81a5c69309c1eec4ad8bb723b20998b4a9aa4aa6 | |
| parent | t7700: demonstrate mishandling of objects in packs with a .keep file (diff) | |
| download | tgif-8d25931d6ff47a7fb06512d767d1d416d9bc7733.tar.xz | |
packed_git: convert pack_local flag into a bitfield and add pack_keep
pack_keep will be set when a pack file has an associated .keep file.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | cache.h | 3 | ||||
| -rw-r--r-- | sha1_file.c | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -671,7 +671,8 @@ extern struct packed_git { int index_version; time_t mtime; int pack_fd; - int pack_local; + unsigned pack_local:1, + pack_keep:1; unsigned char sha1[20]; /* something like ".git/objects/pack/xxxxx.pack" */ char pack_name[FLEX_ARRAY]; /* more */ diff --git a/sha1_file.c b/sha1_file.c index 12fc767ee5..adb116350b 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -828,6 +828,11 @@ struct packed_git *add_packed_git(const char *path, int path_len, int local) return NULL; } memcpy(p->pack_name, path, path_len); + + strcpy(p->pack_name + path_len, ".keep"); + if (!access(p->pack_name, F_OK)) + p->pack_keep = 1; + strcpy(p->pack_name + path_len, ".pack"); if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) { free(p); |