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

diff-tree: clean up diff_tree_stdin() function

Browse Source 
Split it into the "one commit" vs "two trees" case, since we'll
want to use the "one commit" case for other things too.
This commit is contained in:
Linus Torvalds
2005-05-18 13:06:47 -07:00
parent e11b29c50c
commit b11645be01
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
diff-tree.c
View File

@ -342,13 +342,39 @@ static char *generate_header(const char *commit, const char *parent, const char
return this_header; return this_header;
} }
static int diff_tree_commit(const unsigned char *commit, const char *name)
{
unsigned long size, offset;
char *buf = read_object_with_reference(commit, "commit", &size, NULL);
if (!buf)
return -1;
/* More than one parent? */
if (ignore_merges) {
if (!memcmp(buf + 46 + 48, "parent ", 7))
return 0;
}
offset = 46;
while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
unsigned char parent[20];
if (get_sha1_hex(buf + offset + 7, parent))
return -1;
header = generate_header(name, sha1_to_hex(parent), buf, size);
diff_tree_sha1(parent, commit, "");
if (!header && verbose_header)
header_prefix = "\ndiff-tree ";
offset += 48;
}
return 0;
}
static int diff_tree_stdin(char *line) static int diff_tree_stdin(char *line)
{ {
int len = strlen(line); int len = strlen(line);
unsigned char commit[20], parent[20]; unsigned char commit[20], parent[20];
unsigned long size, offset;
static char this_header[1000]; static char this_header[1000];
char *buf;
if (!len || line[len-1] != '\n') if (!len || line[len-1] != '\n')
return -1; return -1;
@ -362,28 +388,8 @@ static int diff_tree_stdin(char *line)
header = this_header; header = this_header;
return diff_tree_sha1(parent, commit, ""); return diff_tree_sha1(parent, commit, "");
} }
buf = read_object_with_reference(commit, "commit", &size, NULL);
if (!buf)
return -1;
/* More than one parent? */
if (ignore_merges) {
if (!memcmp(buf + 46 + 48, "parent ", 7))
return 0;
}
line[40] = 0; line[40] = 0;
offset = 46; return diff_tree_commit(commit, line);
while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
if (get_sha1_hex(buf + offset + 7, parent))
return -1;
header = generate_header(line, sha1_to_hex(parent), buf, size);
diff_tree_sha1(parent, commit, "");
if (!header && verbose_header)
header_prefix = "\ndiff-tree ";
offset += 48;
}
return -1;
} }
static char *diff_tree_usage = static char *diff_tree_usage =