Provide better feedback for the untracked only case in status output
[git/jr.git] / mktree.c
blob56205d1e0053cdcb7236bde199817a5529d3f433
1 /*
2 * GIT - the stupid content tracker
4 * Copyright (c) Junio C Hamano, 2006
5 */
6 #include "cache.h"
7 #include "strbuf.h"
8 #include "quote.h"
9 #include "tree.h"
11 static struct treeent {
12 unsigned mode;
13 unsigned char sha1[20];
14 int len;
15 char name[FLEX_ARRAY];
16 } **entries;
17 static int alloc, used;
19 static void append_to_tree(unsigned mode, unsigned char *sha1, char *path)
21 struct treeent *ent;
22 int len = strlen(path);
23 if (strchr(path, '/'))
24 die("path %s contains slash", path);
26 if (alloc <= used) {
27 alloc = alloc_nr(used);
28 entries = xrealloc(entries, sizeof(*entries) * alloc);
30 ent = entries[used++] = xmalloc(sizeof(**entries) + len + 1);
31 ent->mode = mode;
32 ent->len = len;
33 hashcpy(ent->sha1, sha1);
34 memcpy(ent->name, path, len+1);
37 static int ent_compare(const void *a_, const void *b_)
39 struct treeent *a = *(struct treeent **)a_;
40 struct treeent *b = *(struct treeent **)b_;
41 return base_name_compare(a->name, a->len, a->mode,
42 b->name, b->len, b->mode);
45 static void write_tree(unsigned char *sha1)
47 char *buffer;
48 unsigned long size, offset;
49 int i;
51 qsort(entries, used, sizeof(*entries), ent_compare);
52 for (size = i = 0; i < used; i++)
53 size += 32 + entries[i]->len;
54 buffer = xmalloc(size);
55 offset = 0;
57 for (i = 0; i < used; i++) {
58 struct treeent *ent = entries[i];
60 if (offset + ent->len + 100 < size) {
61 size = alloc_nr(offset + ent->len + 100);
62 buffer = xrealloc(buffer, size);
64 offset += sprintf(buffer + offset, "%o ", ent->mode);
65 offset += sprintf(buffer + offset, "%s", ent->name);
66 buffer[offset++] = 0;
67 hashcpy((unsigned char*)buffer + offset, ent->sha1);
68 offset += 20;
70 write_sha1_file(buffer, offset, tree_type, sha1);
73 static const char mktree_usage[] = "git-mktree [-z]";
75 int main(int ac, char **av)
77 struct strbuf sb;
78 unsigned char sha1[20];
79 int line_termination = '\n';
81 setup_git_directory();
83 while ((1 < ac) && av[1][0] == '-') {
84 char *arg = av[1];
85 if (!strcmp("-z", arg))
86 line_termination = 0;
87 else
88 usage(mktree_usage);
89 ac--;
90 av++;
93 strbuf_init(&sb);
94 while (1) {
95 int len;
96 char *ptr, *ntr;
97 unsigned mode;
98 char type[20];
99 char *path;
101 read_line(&sb, stdin, line_termination);
102 if (sb.eof)
103 break;
104 len = sb.len;
105 ptr = sb.buf;
106 /* Input is non-recursive ls-tree output format
107 * mode SP type SP sha1 TAB name
109 mode = strtoul(ptr, &ntr, 8);
110 if (ptr == ntr || !ntr || *ntr != ' ')
111 die("input format error: %s", sb.buf);
112 ptr = ntr + 1; /* type */
113 ntr = strchr(ptr, ' ');
114 if (!ntr || sb.buf + len <= ntr + 41 ||
115 ntr[41] != '\t' ||
116 get_sha1_hex(ntr + 1, sha1))
117 die("input format error: %s", sb.buf);
118 if (sha1_object_info(sha1, type, NULL))
119 die("object %s unavailable", sha1_to_hex(sha1));
120 *ntr++ = 0; /* now at the beginning of SHA1 */
121 if (strcmp(ptr, type))
122 die("object type %s mismatch (%s)", ptr, type);
123 ntr += 41; /* at the beginning of name */
124 if (line_termination && ntr[0] == '"')
125 path = unquote_c_style(ntr, NULL);
126 else
127 path = ntr;
129 append_to_tree(mode, sha1, path);
131 if (path != ntr)
132 free(path);
134 write_tree(sha1);
135 puts(sha1_to_hex(sha1));
136 exit(0);