projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-base: Clarify the comments on post processing.
[git.git]
/
write-tree.c
diff --git
a/write-tree.c
b/write-tree.c
index
0aac32f
..
dcad6e6
100644
(file)
--- a/
write-tree.c
+++ b/
write-tree.c
@@
-4,6
+4,7
@@
* Copyright (C) Linus Torvalds, 2005
*/
#include "cache.h"
* Copyright (C) Linus Torvalds, 2005
*/
#include "cache.h"
+#include "tree.h"
static int missing_ok = 0;
static int missing_ok = 0;
@@
-78,11
+79,13
@@
static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
nr++;
}
nr++;
}
- write_sha1_file(buffer, offset,
"tree"
, returnsha1);
+ write_sha1_file(buffer, offset,
tree_type
, returnsha1);
free(buffer);
return nr;
}
free(buffer);
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;
@@
-96,7
+99,7
@@
int main(int argc, char **argv)
if (!strcmp(argv[1], "--missing-ok"))
missing_ok = 1;
else
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)
@@
-109,7
+112,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;