diff.c: fix some recent whitespace style violations

peff · gitster · commit 0ea7d5b6f8e2 · 2013-12-16T13:04:47.000-08:00
These were introduced by ee7fb0b. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -2936,7 +2936,7 @@ static void run_external_diff(const char *pgm,`
`2936`	`2936`
`2937`	`2937`	`env[0] = env_counter;`
`2938`	`2938`	`snprintf(env_counter, sizeof(env_counter), "GIT_DIFF_PATH_COUNTER=%d",`
`2939`		`- ++o->diff_path_counter);`
	`2939`	`+ ++o->diff_path_counter);`
`2940`	`2940`	`env[1] = env_total;`
`2941`	`2941`	`snprintf(env_total, sizeof(env_total), "GIT_DIFF_PATH_TOTAL=%d", q->nr);`
`2942`	`2942`
`@@ -3330,7 +3330,7 @@ void diff_setup_done(struct diff_options *options)`
`3330`	`3330`	`DIFF_OPT_SET(options, EXIT_WITH_STATUS);`
`3331`	`3331`	`}`
`3332`	`3332`
`3333`		`- options->diff_path_counter = 0;`
	`3333`	`+ options->diff_path_counter = 0;`
`3334`	`3334`	`}`
`3335`	`3335`
`3336`	`3336`	`static int opt_arg(const char arg, int arg_short, const char arg_long, int *val)`