Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
write-tree: refuse to write out trees with unmerged index entries.
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 05:04:54 +0000
(22:04 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 05:04:54 +0000
(22:04 -0700)
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).
write-tree.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
f5cabd1
)
diff --git
a/write-tree.c
b/write-tree.c
index e2bbbd261e76800df8882c2bb9f15dda953804d2..b58871c7d9e7b3a3772831f2f9df04268e908987 100644
(file)
--- 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 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");
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));
if (write_tree(active_cache, entries, "", 0, sha1) != entries)
die("write-tree: internal error");
printf("%s\n", sha1_to_hex(sha1));