Merge branch 'ar/win'

diff --git a/write-tree.c b/write-tree.c
index 0aac32f2271760f3f576ca2979e61fbd1ba83794..addb5de3b6ea5a84ea71293aee5b50f1e70ea720 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -83,6 +83,8 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
        return nr;
 }
 
+static const char write_tree_usage[] = "git-write-tree [--missing-ok]";
+
 int main(int argc, char **argv)
 {
        int i, funny;
@@ -96,7 +98,7 @@ int main(int argc, char **argv)
                if (!strcmp(argv[1], "--missing-ok"))
                        missing_ok = 1;
                else
-                       die("unknown option %s", argv[1]);
+                       die(write_tree_usage);
        }
        
        if (argc > 2)
@@ -109,7 +111,7 @@ int main(int argc, char **argv)
        funny = 0;
        for (i = 0; i < entries; i++) {
                struct cache_entry *ce = active_cache[i];
-               if (ntohs(ce->ce_flags) & ~CE_NAMEMASK) {
+               if (ce_stage(ce)) {
                        if (10 < ++funny) {
                                fprintf(stderr, "...\n");
                                break;