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

diff: convert struct combine_diff_path to object_id

Browse Source 
Also, convert a constant to GIT_SHA1_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2015-03-13 23:39:33 +00:00
committed by Junio C Hamano
parent fa33c3aae2
commit 1ff57c13c5
4 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
diff.h
View File

@ -6,6 +6,7 @@
#include "tree-walk.h"
#include "pathspec.h"
#include "object.h"
struct rev_info;
struct diff_options;
@ -207,11 +208,11 @@ struct combine_diff_path {
struct combine_diff_path *next;
char *path;
unsigned int mode;
unsigned char sha1[20];
struct object_id oid;
struct combine_diff_parent {
char status;
unsigned int mode;
unsigned char sha1[20];
struct object_id oid;
} parent[FLEX_ARRAY];
};
#define combine_diff_path_size(n, l) \