summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-26 20:13:17 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-26 20:13:17 -0700
commit8194fcaa1f0999064a170ed24d36be5432815dce (patch)
tree99c52b1bbaa3eee26bb8e21b77cb0ea477cd4dec /diff.c
parent908535c1fa1c5cddddfa74732c66d625e99bd6b0 (diff)
parentc0aa335c95974caebcc972cd63a11e6ff73b1612 (diff)
downloadgit-8194fcaa1f0999064a170ed24d36be5432815dce.tar.gz
Merge branch 'js/remove-unused-variables'
* js/remove-unused-variables: Remove unused variables
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index 9b3eb9938f..9fa841010c 100644
--- a/diff.c
+++ b/diff.c
@@ -1242,7 +1242,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
uintmax_t max_change = 0, max_len = 0;
int total_files = data->nr;
int width, name_width;
- const char *reset, *set, *add_c, *del_c;
+ const char *reset, *add_c, *del_c;
const char *line_prefix = "";
struct strbuf *msg = NULL;
@@ -1269,7 +1269,6 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
/* Find the longest filename and max number of changes */
reset = diff_get_color_opt(options, DIFF_RESET);
- set = diff_get_color_opt(options, DIFF_PLAIN);
add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
del_c = diff_get_color_opt(options, DIFF_FILE_OLD);