projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/git-svn: documentation updates
[git.git]
/
write-tree.c
diff --git
a/write-tree.c
b/write-tree.c
index
2b2c6b7
..
addb5de
100644
(file)
--- a/
write-tree.c
+++ b/
write-tree.c
@@
-83,17
+83,22
@@
static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
return nr;
}
return nr;
}
+static const char write_tree_usage[] = "git-write-tree [--missing-ok]";
+
int main(int argc, char **argv)
{
int i, funny;
int main(int argc, char **argv)
{
int i, funny;
- int entries
= read_cache()
;
+ int entries;
unsigned char sha1[20];
unsigned char sha1[20];
+ setup_git_directory();
+
+ entries = read_cache();
if (argc == 2) {
if (!strcmp(argv[1], "--missing-ok"))
missing_ok = 1;
else
if (argc == 2) {
if (!strcmp(argv[1], "--missing-ok"))
missing_ok = 1;
else
- die(
"unknown option %s", argv[1]
);
+ die(
write_tree_usage
);
}
if (argc > 2)
}
if (argc > 2)
@@
-106,7
+111,7
@@
int main(int argc, char **argv)
funny = 0;
for (i = 0; i < entries; i++) {
struct cache_entry *ce = active_cache[i];
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;
if (10 < ++funny) {
fprintf(stderr, "...\n");
break;