summaryrefslogtreecommitdiff
path: root/write-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 05:04:54 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 05:04:54 (GMT)
commitc347ea5d6fc6bae6b6ea3196013c4df7ec4406a8 (patch)
tree905781d15f6cb171e9c4360465905c7c27f835ee /write-tree.c
parentf5cabd13d814bb5c547a13af03bcc42122531141 (diff)
downloadgit-c347ea5d6fc6bae6b6ea3196013c4df7ec4406a8.zip
git-c347ea5d6fc6bae6b6ea3196013c4df7ec4406a8.tar.gz
git-c347ea5d6fc6bae6b6ea3196013c4df7ec4406a8.tar.bz2
write-tree: refuse to write out trees with unmerged index entries.
Of course, we can't even generate such an index yet, but give me some time. This is a cunning plan. Let's see if it actually works. (I feel like Wile E Coyote, waiting for the big rock to fall).
Diffstat (limited to 'write-tree.c')
-rw-r--r--write-tree.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/write-tree.c b/write-tree.c
index e2bbbd2..b58871c 100644
--- a/write-tree.c
+++ b/write-tree.c
@@ -102,11 +102,29 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
int main(int argc, char **argv)
{
+ int i, unmerged;
int entries = read_cache();
unsigned char sha1[20];
if (entries <= 0)
die("write-tree: no cache contents to write");
+
+ /* Verify that the tree is merged */
+ unmerged = 0;
+ for (i = 0; i < entries; i++) {
+ struct cache_entry *ce = active_cache[i];
+ if (ntohs(ce->ce_flags) & ~CE_NAMEMASK) {
+ if (++unmerged > 10) {
+ fprintf(stderr, "...\n");
+ break;
+ }
+ fprintf(stderr, "%s: unmerged (%s)\n", ce->name, sha1_to_hex(ce->sha1));
+ }
+ }
+ if (unmerged)
+ die("write-tree: not able to write tree");
+
+ /* Ok, write it out */
if (write_tree(active_cache, entries, "", 0, sha1) != entries)
die("write-tree: internal error");
printf("%s\n", sha1_to_hex(sha1));