diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 01:18:40 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 01:18:40 (GMT) |
| commit | d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f (patch) | |
| tree | d44581630e7a2f095d96b33876f6e0c14ce76a5a /diff-tree-helper.c | |
| parent | 4feb7a016ae0b237af5e667277fa632326a58eac (diff) | |
| parent | 8a9d32b7e9f3aebd9c322c4613c4608224d09a60 (diff) | |
| download | git-d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f.zip git-d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f.tar.gz git-d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f.tar.bz2 | |
Merge http://members.cox.net/junkio/git-jc.git/
Diffstat (limited to 'diff-tree-helper.c')
| -rw-r--r-- | diff-tree-helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/diff-tree-helper.c b/diff-tree-helper.c index 621f90a..a683283 100644 --- a/diff-tree-helper.c +++ b/diff-tree-helper.c @@ -35,7 +35,7 @@ static int parse_oneside_change(const char *cp, struct diff_spec *one, if (strncmp(cp, "\tblob\t", 6)) return -1; cp += 6; - if (get_sha1_hex(cp, one->u.sha1)) + if (get_sha1_hex(cp, one->blob_sha1)) return -1; cp += 40; if (*cp++ != '\t') @@ -83,13 +83,13 @@ static int parse_diff_tree_output(const char *buf, if (strncmp(cp, "\tblob\t", 6)) return -1; cp += 6; - if (get_sha1_hex(cp, old.u.sha1)) + if (get_sha1_hex(cp, old.blob_sha1)) return -1; cp += 40; if (strncmp(cp, "->", 2)) return -1; cp += 2; - if (get_sha1_hex(cp, new.u.sha1)) + if (get_sha1_hex(cp, new.blob_sha1)) return -1; cp += 40; if (*cp++ != '\t') |