path: root/commit-tree.c
diff options
authorLinus Torvalds <>2005-06-19 17:40:10 (GMT)
committerLinus Torvalds <>2005-06-19 17:40:10 (GMT)
commitb389237ae8cd04c2f53db52e37c02e30c63bcc89 (patch)
tree39a61c090453e0efd5329e5732f8c1e74f6db2ef /commit-tree.c
parent1c107dc422498085493a5cccbac50096284ebe94 (diff)
git-commit-tree: ignore duplicate parents
But warn about them. If somebody really ends up later wanting to explicitly add a note that something has the same parent twice (who knows, there are strange people around), we can add a flag to say that it's expected and ok. This was brought on by a commit in the kernel tree, where a repeated merge caused a duplicate parent. Parent duplicates aren't "wrong" per se, they're just in practice not something you are ever interested in.
Diffstat (limited to 'commit-tree.c')
1 files changed, 16 insertions, 2 deletions
diff --git a/commit-tree.c b/commit-tree.c
index 1d125b8..0d504e7 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -95,15 +95,28 @@ static void check_valid(unsigned char *sha1, const char *expect)
* how multi-way merges are represented.
#define MAXPARENT (16)
+static unsigned char parent_sha1[MAXPARENT][20];
static char *commit_tree_usage = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
+static int new_parent(int idx)
+ 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;
+ }
+ }
+ return 1;
int main(int argc, char **argv)
int i, len;
int parents = 0;
unsigned char tree_sha1[20];
- unsigned char parent_sha1[MAXPARENT][20];
unsigned char commit_sha1[20];
char *gecos, *realgecos, *commitgecos;
char *email, *commitemail, realemail[1000];
@@ -124,7 +137,8 @@ int main(int argc, char **argv)
if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
check_valid(parent_sha1[parents], "commit");
- parents++;
+ if (new_parent(parents))
+ parents++;
if (!parents)
fprintf(stderr, "Committing initial tree %s\n", argv[1]);