Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 141 lines (121 sloc) 3.389 kB
8bc9a0c Add copyright notices.
Linus Torvalds authored
1 /*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
6 #include "cache.h"
8e44025 Use blob_, commit_, tag_, and tree_type throughout.
Peter Eriksen authored
7 #include "commit.h"
8 #include "tree.h"
6d96ac1 Builtin git-commit-tree.
Peter Eriksen authored
9 #include "builtin.h"
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
10
11 #define BLOCKING (1ul << 14)
12
13 /*
14 * FIXME! Share the code with "write-tree.c"
15 */
16 static void init_buffer(char **bufp, unsigned int *sizep)
17 {
812666c [PATCH] introduce xmalloc and xrealloc
Christopher Li authored
18 char *buf = xmalloc(BLOCKING);
a44c9a5 Simplify "write_sha1_file()" interfaces
Linus Torvalds authored
19 *sizep = 0;
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
20 *bufp = buf;
21 }
22
23 static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
24 {
25 char one_line[2048];
26 va_list args;
27 int len;
28 unsigned long alloc, size, newsize;
29 char *buf;
30
31 va_start(args, fmt);
32 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
33 va_end(args);
34 size = *sizep;
35 newsize = size + len;
36 alloc = (size + 32767) & ~32767;
37 buf = *bufp;
38 if (newsize > alloc) {
aebb267 [PATCH] Whitespace Fixes
Ingo Molnar authored
39 alloc = (newsize + 32767) & ~32767;
812666c [PATCH] introduce xmalloc and xrealloc
Christopher Li authored
40 buf = xrealloc(buf, alloc);
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
41 *bufp = buf;
42 }
43 *sizep = newsize;
44 memcpy(buf + size, one_line, len);
45 }
46
d0d7cbe Make "commit-tree" check the input objects more carefully.
Linus Torvalds authored
47 static void check_valid(unsigned char *sha1, const char *expect)
48 {
49 char type[20];
50
5981e09 commit-tree.c: check_valid() microoptimization.
Junio C Hamano authored
51 if (sha1_object_info(sha1, type, NULL))
52 die("%s is not a valid object", sha1_to_hex(sha1));
53 if (expect && strcmp(type, expect))
54 die("%s is not a valid '%s' object", sha1_to_hex(sha1),
55 expect);
d0d7cbe Make "commit-tree" check the input objects more carefully.
Linus Torvalds authored
56 }
57
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
58 /*
c5bac17 [PATCH] Usage-string fixes.
Junio C Hamano authored
59 * Having more than two parents is not strange at all, and this is
60 * how multi-way merges are represented.
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
61 */
62 #define MAXPARENT (16)
b389237 git-commit-tree: ignore duplicate parents
Linus Torvalds authored
63 static unsigned char parent_sha1[MAXPARENT][20];
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
64
4d1f119 [PATCH] Unify usage strings declaration
Petr Baudis authored
65 static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
c5bac17 [PATCH] Usage-string fixes.
Junio C Hamano authored
66
b389237 git-commit-tree: ignore duplicate parents
Linus Torvalds authored
67 static int new_parent(int idx)
68 {
69 int i;
70 unsigned char *sha1 = parent_sha1[idx];
71 for (i = 0; i < idx; i++) {
72 if (!memcmp(parent_sha1[i], sha1, 20)) {
73 error("duplicate parent %s ignored", sha1_to_hex(sha1));
74 return 0;
75 }
76 }
77 return 1;
78 }
79
6d96ac1 Builtin git-commit-tree.
Peter Eriksen authored
80 int cmd_commit_tree(int argc, const char **argv, char **envp)
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
81 {
6aa33f4 Abstract out the "name <email> date" handling of commit-tree.c
Linus Torvalds authored
82 int i;
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
83 int parents = 0;
84 unsigned char tree_sha1[20];
d6d3f9d This implements the new "recursive tree" write-tree.
Linus Torvalds authored
85 unsigned char commit_sha1[20];
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
86 char comment[1000];
87 char *buffer;
88 unsigned int size;
89
e1b1039 Use git config file for committer name and email info
Linus Torvalds authored
90 setup_ident();
ce1610e call git_config() after setup_git_directory()
Junio C Hamano authored
91 setup_git_directory();
92
e1b1039 Use git config file for committer name and email info
Linus Torvalds authored
93 git_config(git_default_config);
94
31fff30 Separate object name errors from usage errors
Dmitry V. Levin authored
95 if (argc < 2)
c5bac17 [PATCH] Usage-string fixes.
Junio C Hamano authored
96 usage(commit_tree_usage);
31fff30 Separate object name errors from usage errors
Dmitry V. Levin authored
97 if (get_sha1(argv[1], tree_sha1))
98 die("Not a valid object name %s", argv[1]);
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
99
8e44025 Use blob_, commit_, tag_, and tree_type throughout.
Peter Eriksen authored
100 check_valid(tree_sha1, tree_type);
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
101 for (i = 2; i < argc; i += 2) {
6d96ac1 Builtin git-commit-tree.
Peter Eriksen authored
102 const char *a, *b;
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
103 a = argv[i]; b = argv[i+1];
31fff30 Separate object name errors from usage errors
Dmitry V. Levin authored
104 if (!b || strcmp(a, "-p"))
c5bac17 [PATCH] Usage-string fixes.
Junio C Hamano authored
105 usage(commit_tree_usage);
31fff30 Separate object name errors from usage errors
Dmitry V. Levin authored
106 if (get_sha1(b, parent_sha1[parents]))
107 die("Not a valid object name %s", b);
8e44025 Use blob_, commit_, tag_, and tree_type throughout.
Peter Eriksen authored
108 check_valid(parent_sha1[parents], commit_type);
b389237 git-commit-tree: ignore duplicate parents
Linus Torvalds authored
109 if (new_parent(parents))
110 parents++;
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
111 }
112 if (!parents)
113 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
114
115 init_buffer(&buffer, &size);
116 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
117
118 /*
119 * NOTE! This ordering means that the same exact tree merged with a
120 * different order of parents will be a _different_ changeset even
121 * if everything else stays the same.
122 */
123 for (i = 0; i < parents; i++)
124 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
125
126 /* Person/date information */
749be72 Delay "empty ident" errors until they really matter.
Junio C Hamano authored
127 add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
128 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
129
130 /* And add the comment */
131 while (fgets(comment, sizeof(comment), stdin) != NULL)
132 add_buffer(&buffer, &size, "%s", comment);
133
8e44025 Use blob_, commit_, tag_, and tree_type throughout.
Peter Eriksen authored
134 if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
7561d9f commit-tree: check return value from write_sha1_file()
Junio C Hamano authored
135 printf("%s\n", sha1_to_hex(commit_sha1));
136 return 0;
137 }
138 else
139 return 1;
e83c516 Initial revision of "git", the information manager from hell
Linus Torvalds authored
140 }
Something went wrong with that request. Please try again.