X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=eff445596d98e46d40dd37843e690de27c5fabf1;hb=9d0524d42f340fc49f9e175d966afb7dce3854bb;hp=6fda92a7b5e69cbedfe5b13e9c4e7fba54a7ed7f;hpb=2f3f8b218abae6fc0574d0e22d3614fc0f5e983d;p=git.git diff --git a/diff.h b/diff.h index 6fda92a7b..eff445596 100644 --- a/diff.h +++ b/diff.h @@ -29,6 +29,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_FORMAT_NUMSTAT 0x0004 #define DIFF_FORMAT_SUMMARY 0x0008 #define DIFF_FORMAT_PATCH 0x0010 +#define DIFF_FORMAT_SHORTSTAT 0x0020 /* These override all above */ #define DIFF_FORMAT_NAME 0x0100 @@ -103,6 +104,8 @@ extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt); extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt); +extern int diff_root_tree_sha1(const unsigned char *new, const char *base, + struct diff_options *opt); struct combine_diff_path { struct combine_diff_path *next;