mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use struct sha1_array in diff_tree_combined()

Browse Source 
Maintaining an array of hashes is easier using sha1_array than
open-coding it.  This patch also fixes a leak of the SHA1 array
in  diff_tree_combined_merge().

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2011-12-17 11:15:48 +01:00
committed by Junio C Hamano
parent ee22802493
commit 0041f09de6
4 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/diff.c
View File

@ -14,6 +14,7 @@
#include "log-tree.h"
#include "builtin.h"
#include "submodule.h"
#include "sha1-array.h"
struct blobinfo {
unsigned char sha1[20];
@ -169,7 +170,7 @@ static int builtin_diff_combined(struct rev_info *revs,
struct object_array_entry *ent,
int ents)
{
const unsigned char (*parent)[20];
struct sha1_array parents = SHA1_ARRAY_INIT;
int i;
if (argc > 1)
@ -177,12 +178,11 @@ static int builtin_diff_combined(struct rev_info *revs,
if (!revs->dense_combined_merges && !revs->combine_merges)
revs->dense_combined_merges = revs->combine_merges = 1;
parent = xmalloc(ents * sizeof(*parent));
for (i = 0; i < ents; i++)
hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
diff_tree_combined(parent[0], parent + 1, ents - 1,
for (i = 1; i < ents; i++)
sha1_array_append(&parents, ent[i].item->sha1);
diff_tree_combined(ent[0].item->sha1, &parents,
revs->dense_combined_merges, revs);
free((void *)parent);
sha1_array_clear(&parents);
return 0;
}