mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 15:06:31 +02:00
Code

line-log: convert to using diff_tree_sha1() 

Since diff_tree_sha1() can now accept empty trees via NULL sha1, we
could just call it without manually reading trees into tree_desc and
duplicating code.

Cc: Thomas Rast <tr@thomasrast.ch>
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kirill Smelkov 2014-02-05 20:57:11 +04:00 committed by Junio C Hamano
parent 0b707c3319
commit 7bc4ec01dd
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
line-log.c
View File

@ -766,16 +766,6 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list
}
}
static void load_tree_desc(struct tree_desc *desc, void **tree,
const unsigned char *sha1)
{
unsigned long size;
*tree = read_object_with_reference(sha1, tree_type, &size, NULL);
if (!*tree)
die("Unable to read tree (%s)", sha1_to_hex(sha1));
init_tree_desc(desc, *tree, size);
}
static int count_parents(struct commit *commit)
{
struct commit_list *parents = commit->parents;
@ -842,18 +832,11 @@ static void queue_diffs(struct line_log_data *range,
struct diff_queue_struct *queue,
struct commit *commit, struct commit *parent)
{
void *tree1 = NULL, *tree2 = NULL;
struct tree_desc desc1, desc2;
assert(commit);
load_tree_desc(&desc2, &tree2, commit->tree->object.sha1);
if (parent)
load_tree_desc(&desc1, &tree1, parent->tree->object.sha1);
else
init_tree_desc(&desc1, "", 0);
DIFF_QUEUE_CLEAR(&diff_queued_diff);
diff_tree(&desc1, &desc2, "", opt);
diff_tree_sha1(parent ? parent->tree->object.sha1 : NULL,
commit->tree->object.sha1, "", opt);
if (opt->detect_rename) {
filter_diffs_for_paths(range, 1);
if (diff_might_be_rename())
@ -861,11 +844,6 @@ static void queue_diffs(struct line_log_data *range,
filter_diffs_for_paths(range, 0);
}
move_diff_queue(queue, &diff_queued_diff);
if (tree1)
free(tree1);
if (tree2)
free(tree2);
}
static char *get_nth_line(long line, unsigned long *ends, void *data)