Re: [PATCH] commit-tree: lift completely arbitrary limit of 16 parents

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:

> -static int new_parent(int idx)
> +static void new_parent(struct commit *parent, struct commit_list **parents_p)
>  {
> -	int i;
> -	unsigned char *sha1 = parent_sha1[idx];
> -	for (i = 0; i < idx; i++) {
> -		if (!hashcmp(parent_sha1[i], sha1)) {
> +	unsigned char *sha1 = parent->object.sha1;
> +	struct commit_list *parents;
> +	for (parents = *parents_p; parents; parents = parents->next) {
> +		if (!hashcmp(parents->item->object.sha1, sha1)) {

Wouldn't it be enough to compare (parents->item == parent)?

> @@ -69,18 +63,16 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
>  
>  	check_valid(tree_sha1, OBJ_TREE);
>  	for (i = 2; i < argc; i += 2) {
> +		unsigned char sha1[40];

s/4/2/;

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux