Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
diff.c: fix some recent whitespace style violations
author
Jeff King
<peff@peff.net>
Mon, 16 Dec 2013 20:02:21 +0000
(15:02 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 16 Dec 2013 21:04:47 +0000
(13:04 -0800)
These were introduced by
ee7fb0b
.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ee7fb0b
)
diff --git
a/diff.c
b/diff.c
index a7d5a47edf36a8b6901886615b5f32da01ecb118..d69cc1b19c2be80dd3d8adc796ca0d8d100b3bfc 100644
(file)
--- 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",
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);
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);
}
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)
}
static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)