Merge branch 'lt/commit-tree-guess-utf-8'

diff --git a/builtin/apply.c b/builtin/apply.c
index d453c833782c6aae4dd04fb9f9f68c3a8211d3d5..3bf71dc4522564463945673aaba0501a51141bb2 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -188,7 +188,6 @@ struct patch {
        int is_new, is_delete;  /* -1 = unknown, 0 = false, 1 = true */
        int rejected;
        unsigned ws_rule;
-       unsigned long deflate_origlen;
        int lines_added, lines_deleted;
        int score;
        unsigned int is_toplevel_relative:1;