diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 10:53:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 10:53:11 -0700 |
| commit | 10a32fa95466f0c16531fe9b3d3f9a190f90f5f2 (patch) | |
| tree | 118ffaeb59c958b3615d2c2fb2a856c798984663 | |
| parent | 9a8eea9604ade731c3d0ff10136f2ae81b2a13c8 (diff) | |
| parent | ee922391864026097a196f97ecb14548ab2bf211 (diff) | |
| download | git-10a32fa95466f0c16531fe9b3d3f9a190f90f5f2.tar.gz git-10a32fa95466f0c16531fe9b3d3f9a190f90f5f2.tar.xz | |
Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11
* pg/maint-apply-remove-unused-variable:
apply: delete unused deflate_origlen from patch struct
| -rw-r--r-- | builtin/apply.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index b4428ea34..ca54ff3aa 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -184,7 +184,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; |