summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:52 (GMT)
commit3434569fc206c2f4bc434571d202f2961aa905e5 (patch)
tree87899124d519d771b5b4c15a779ae594ef44d801 /diff.c
parente07074d3f0f0efcb6cef30dc603d75c595942431 (diff)
parent3b3357626edc841a51d8885ddf6986bab5b6f778 (diff)
downloadgit-3434569fc206c2f4bc434571d202f2961aa905e5.zip
git-3434569fc206c2f4bc434571d202f2961aa905e5.tar.gz
git-3434569fc206c2f4bc434571d202f2961aa905e5.tar.bz2
Merge branch 'nd/style-opening-brace'
Code clean-up. * nd/style-opening-brace: style: the opening '{' of a function is in a separate line
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index f1e901a..1b5f276 100644
--- a/diff.c
+++ b/diff.c
@@ -1641,7 +1641,8 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
strbuf_release(&msgbuf);
}
-static struct diff_tempfile *claim_diff_tempfile(void) {
+static struct diff_tempfile *claim_diff_tempfile(void)
+{
int i;
for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
if (!diff_temp[i].name)
@@ -4823,7 +4824,8 @@ static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
return 0;
}
-static void enable_patch_output(int *fmt) {
+static void enable_patch_output(int *fmt)
+{
*fmt &= ~DIFF_FORMAT_NO_OUTPUT;
*fmt |= DIFF_FORMAT_PATCH;
}