summaryrefslogtreecommitdiff
path: root/builtin-fsck.c
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2008-07-24 17:41:12 -0500
committerJunio C Hamano <gitster@pobox.com>2008-07-24 23:08:07 -0700
commit0e8316cc16f1a938c36f12f5fcae4a081b6ec6ff (patch)
tree8bd5d7b24dcbd30ab5ef7c2581bea279405528c2 /builtin-fsck.c
parent186458b11b090835fa793bcdbf6b5552b053276c (diff)
downloadgit-0e8316cc16f1a938c36f12f5fcae4a081b6ec6ff.tar.gz
Teach fsck and prune about the new location of temporary objects
Since 5723fe7e, temporary objects are now created in their final destination directories, rather than in .git/objects/. Teach fsck to recognize and ignore the temporary objects it encounters, and teach prune to remove them. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fsck.c')
-rw-r--r--builtin-fsck.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-fsck.c b/builtin-fsck.c
index 7326dc33a5..7a4a4f144f 100644
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
@@ -377,6 +377,10 @@ static void fsck_dir(int i, char *path)
if (de->d_name[0] != '.')
break;
continue;
+ case 14:
+ if (prefixcmp(de->d_name, "tmp_obj_"))
+ break;
+ continue;
case 38:
sprintf(name, "%02x", i);
memcpy(name+2, de->d_name, len+1);