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

14
submodule.c
View File

@ -373,15 +373,11 @@ static void collect_submodules_from_diff(struct diff_queue_struct *q,
static void commit_need_pushing(struct commit *commit, struct commit_list *parent, int *needs_pushing)
{
const unsigned char (*parents)[20];
unsigned int i, n;
struct sha1_array parents = SHA1_ARRAY_INIT;
struct rev_info rev;
n = commit_list_count(parent);
parents = xmalloc(n * sizeof(*parents));
for (i = 0; i < n; i++) {
hashcpy((unsigned char *)(parents + i), parent->item->object.sha1);
while (parent) {
sha1_array_append(&parents, parent->item->object.sha1);
parent = parent->next;
}
@ -389,9 +385,9 @@ static void commit_need_pushing(struct commit *commit, struct commit_list *paren
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = collect_submodules_from_diff;
rev.diffopt.format_callback_data = needs_pushing;
diff_tree_combined(commit->object.sha1, parents, n, 1, &rev);
diff_tree_combined(commit->object.sha1, &parents, 1, &rev);
free((void *)parents);
sha1_array_clear(&parents);
}
int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name)