diff --git a/commit-tree.c b/commit-tree.c
index 0d7852f7f295d9fb85b00a71bcb7cfbeb1acd026..88871b022d41eb7542407633419ea1aa1b74c576 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
*/
#include "cache.h"
-#include <pwd.h>
-#include <time.h>
-
#define BLOCKING (1ul << 14)
-#define ORIG_OFFSET (40)
/*
- * Leave space at the beginning to insert the tag
- * once we know how big things are.
- *
* FIXME! Share the code with "write-tree.c"
*/
static void init_buffer(char **bufp, unsigned int *sizep)
{
- char *buf = malloc(BLOCKING);
- memset(buf, 0, ORIG_OFFSET);
- *sizep = ORIG_OFFSET;
+ char *buf = xmalloc(BLOCKING);
+ *sizep = 0;
*bufp = buf;
}
alloc = (size + 32767) & ~32767;
buf = *bufp;
if (newsize > alloc) {
- alloc = (newsize + 32767) & ~32767;
- buf = realloc(buf, alloc);
+ alloc = (newsize + 32767) & ~32767;
+ buf = xrealloc(buf, alloc);
*bufp = buf;
}
*sizep = newsize;
memcpy(buf + size, one_line, len);
}
-static int prepend_integer(char *buffer, unsigned val, int i)
+static void check_valid(unsigned char *sha1, const char *expect)
{
- buffer[--i] = '\0';
- do {
- buffer[--i] = '0' + (val % 10);
- val /= 10;
- } while (val);
- return i;
+ void *buf;
+ char type[20];
+ unsigned long size;
+
+ buf = read_sha1_file(sha1, type, &size);
+ if (!buf || strcmp(type, expect))
+ die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
+ free(buf);
}
-static void finish_buffer(char *tag, char **bufp, unsigned int *sizep)
-{
- int taglen;
- int offset;
- char *buf = *bufp;
- unsigned int size = *sizep;
-
- offset = prepend_integer(buf, size - ORIG_OFFSET, ORIG_OFFSET);
- taglen = strlen(tag);
- offset -= taglen;
- buf += offset;
- size -= offset;
- memcpy(buf, tag, taglen);
+/*
+ * Having more than two parents is not strange at all, and this is
+ * how multi-way merges are represented.
+ */
+#define MAXPARENT (16)
+static unsigned char parent_sha1[MAXPARENT][20];
- *bufp = buf;
- *sizep = size;
-}
+static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
-static void remove_special(char *p)
+static int new_parent(int idx)
{
- char c;
- char *dst = p;
-
- for (;;) {
- c = *p;
- p++;
- switch(c) {
- case '\n': case '<': case '>':
- continue;
+ int i;
+ unsigned char *sha1 = parent_sha1[idx];
+ for (i = 0; i < idx; i++) {
+ if (!memcmp(parent_sha1[i], sha1, 20)) {
+ error("duplicate parent %s ignored", sha1_to_hex(sha1));
+ return 0;
}
- *dst++ = c;
- if (!c)
- break;
}
+ return 1;
}
-/*
- * Having more than two parents may be strange, but hey, there's
- * no conceptual reason why the file format couldn't accept multi-way
- * merges. It might be the "union" of several packages, for example.
- *
- * I don't really expect that to happen, but this is here to make
- * it clear that _conceptually_ it's ok..
- */
-#define MAXPARENT (16)
-
int main(int argc, char **argv)
{
- int i, len;
+ int i;
int parents = 0;
unsigned char tree_sha1[20];
- unsigned char parent_sha1[MAXPARENT][20];
- char *gecos, *realgecos;
- char *email, realemail[1000];
- char *date, *realdate;
+ unsigned char commit_sha1[20];
char comment[1000];
- struct passwd *pw;
- time_t now;
char *buffer;
unsigned int size;
+ setup_ident();
+ setup_git_directory();
+
+ git_config(git_default_config);
+
if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
- usage("commit-tree <sha1> [-p <sha1>]* < changelog");
+ usage(commit_tree_usage);
+ check_valid(tree_sha1, "tree");
for (i = 2; i < argc; i += 2) {
char *a, *b;
a = argv[i]; b = argv[i+1];
- if (!b || strcmp(a, "-p") || get_sha1_hex(b, parent_sha1[parents]))
- usage("commit-tree <sha1> [-p <sha1>]* < changelog");
- parents++;
+ if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
+ usage(commit_tree_usage);
+ check_valid(parent_sha1[parents], "commit");
+ if (new_parent(parents))
+ parents++;
}
if (!parents)
fprintf(stderr, "Committing initial tree %s\n", argv[1]);
- pw = getpwuid(getuid());
- if (!pw)
- usage("You don't exist. Go away!");
- realgecos = pw->pw_gecos;
- len = strlen(pw->pw_name);
- memcpy(realemail, pw->pw_name, len);
- realemail[len] = '@';
- gethostname(realemail+len+1, sizeof(realemail)-len-1);
- time(&now);
- realdate = ctime(&now);
-
- gecos = getenv("COMMITTER_NAME") ? : realgecos;
- email = getenv("COMMITTER_EMAIL") ? : realemail;
- date = getenv("COMMITTER_DATE") ? : realdate;
-
- remove_special(gecos); remove_special(realgecos);
- remove_special(email); remove_special(realemail);
- remove_special(date); remove_special(realdate);
init_buffer(&buffer, &size);
add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
/* Person/date information */
- add_buffer(&buffer, &size, "author %s <%s> %s\n", gecos, email, date);
- add_buffer(&buffer, &size, "committer %s <%s> %s\n\n", realgecos, realemail, realdate);
+ add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
+ add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
/* And add the comment */
while (fgets(comment, sizeof(comment), stdin) != NULL)
add_buffer(&buffer, &size, "%s", comment);
- finish_buffer("commit ", &buffer, &size);
-
- write_sha1_file(buffer, size);
+ write_sha1_file(buffer, size, "commit", commit_sha1);
+ printf("%s\n", sha1_to_hex(commit_sha1));
return 0;
}