summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-12-16 15:02:21 -0500
committerJunio C Hamano <gitster@pobox.com>2013-12-16 13:04:47 -0800
commit0ea7d5b6f8e258fdec067edf1b136ed87c5670e5 (patch)
treeb233a72c921579a9e573663ad6abc0d5a221073e
parentee7fb0b1d433cbb433d2ed5cd9d8738023836b27 (diff)
downloadgit-zk/difftool-counts.tar.gz
diff.c: fix some recent whitespace style violationszk/difftool-counts
These were introduced by ee7fb0b. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index a7d5a47edf..d69cc1b19c 100644
--- a/diff.c
+++ b/diff.c
@@ -2936,7 +2936,7 @@ static void run_external_diff(const char *pgm,
env[0] = env_counter;
snprintf(env_counter, sizeof(env_counter), "GIT_DIFF_PATH_COUNTER=%d",
- ++o->diff_path_counter);
+ ++o->diff_path_counter);
env[1] = env_total;
snprintf(env_total, sizeof(env_total), "GIT_DIFF_PATH_TOTAL=%d", q->nr);
@@ -3330,7 +3330,7 @@ void diff_setup_done(struct diff_options *options)
DIFF_OPT_SET(options, EXIT_WITH_STATUS);
}
- options->diff_path_counter = 0;
+ options->diff_path_counter = 0;
}
static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)