kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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.
maint
Linus Torvalds 2005-06-19 10:40:10 -07:00
parent 1c107dc422
commit b389237ae8
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
commit-tree.c
View File

@ -95,15 +95,28 @@ static void check_valid(unsigned char *sha1, const char *expect)
* how multi-way merges are represented. * how multi-way merges are represented.
*/ */
#define MAXPARENT (16) #define MAXPARENT (16)
static unsigned char parent_sha1[MAXPARENT][20];


static char *commit_tree_usage = "git-commit-tree <sha1> [-p <sha1>]* < changelog"; 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 main(int argc, char **argv)
{ {
int i, len; int i, len;
int parents = 0; int parents = 0;
unsigned char tree_sha1[20]; unsigned char tree_sha1[20];
unsigned char parent_sha1[MAXPARENT][20];
unsigned char commit_sha1[20]; unsigned char commit_sha1[20];
char *gecos, *realgecos, *commitgecos; char *gecos, *realgecos, *commitgecos;
char *email, *commitemail, realemail[1000]; 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])) if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
usage(commit_tree_usage); usage(commit_tree_usage);
check_valid(parent_sha1[parents], "commit"); check_valid(parent_sha1[parents], "commit");
parents++; if (new_parent(parents))
parents++;
} }
if (!parents) if (!parents)
fprintf(stderr, "Committing initial tree %s\n", argv[1]); fprintf(stderr, "Committing initial tree %s\n", argv[1]);