diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 18:18:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 18:18:40 -0700 |
| commit | d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f (patch) | |
| tree | d44581630e7a2f095d96b33876f6e0c14ce76a5a /diff.h | |
| parent | Make "git-prune-script" take all refs into account. (diff) | |
| parent | When the patch tries to create a new file and the file exists, abort. (diff) | |
| download | tgif-d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f.tar.xz | |
Merge http://members.cox.net/junkio/git-jc.git/
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -20,15 +20,12 @@ extern void diff_unmerge(const char *path); /* These are for diff-tree-helper */ struct diff_spec { - union { - const char *name; /* path on the filesystem */ - unsigned char sha1[20]; /* blob object ID */ - } u; + unsigned char blob_sha1[20]; unsigned short mode; /* file mode */ - unsigned sha1_valid : 1; /* if true, use u.sha1 and trust mode. - * (however with a NULL SHA1, read them - * from the file!). - * if false, use u.name and read mode from + unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode; + * however with a NULL SHA1, read them + * from the file system. + * if false, use the name and read mode from * the filesystem. */ unsigned file_valid : 1; /* if false the file does not even exist */ |