summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2019-04-05 08:00:12 -0700
committerJunio C Hamano <gitster@pobox.com>2019-04-08 16:02:07 +0900
commit5ec1e72823735b5682389589b6bee774ae70fa49 (patch)
tree3780b0e33a6ddaaf42f7bfca192fc1fced100922 /tree-diff.c
parent041f5ea1cf987a4068ef5f39ba0a09be85952064 (diff)
downloadgit-5ec1e72823735b5682389589b6bee774ae70fa49.tar.gz
Use 'unsigned short' for mode, like diff_filespec does
struct diff_filespec defines mode to be an 'unsigned short'. Several other places in the API which we'd like to interact with using a diff_filespec used a plain unsigned (or unsigned int). This caused problems when taking addresses, so switch to unsigned short. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-diff.c')
-rw-r--r--tree-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tree-diff.c b/tree-diff.c
index e6d306f69f..f1f641eb6a 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -181,7 +181,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
struct tree_desc *t, struct tree_desc *tp,
int imin)
{
- unsigned mode;
+ unsigned short mode;
const char *path;
const struct object_id *oid;
int pathlen;