diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-03-16 02:08:34 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 12:49:02 -0700 |
| commit | 9cba13ca5d233a4e1a7068f3f5ed5836a081dcc0 (patch) | |
| tree | 434a9b6b6df083e8c340541def4c29c4896b0721 /merge-recursive.c | |
| parent | c6c8d0b797e33ce1f22d50b46d9c6eba91ed2cbc (diff) | |
| download | git-9cba13ca5d233a4e1a7068f3f5ed5836a081dcc0.tar.gz git-9cba13ca5d233a4e1a7068f3f5ed5836a081dcc0.tar.xz | |
standardize brace placement in struct definitions
In a struct definitions, unlike functions, the prevailing style is for
the opening brace to go on the same line as the struct name, like so:
struct foo {
int bar;
char *baz;
};
Indeed, grepping for 'struct [a-z_]* {$' yields about 5 times as many
matches as 'struct [a-z_]*$'.
Linus sayeth:
Heretic people all over the world have claimed that this inconsistency
is ... well ... inconsistent, but all right-thinking people know that
(a) K&R are _right_ and (b) K&R are right.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 16c2dbeab..42d52cb5b 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -83,10 +83,8 @@ struct rename_df_conflict_info { * Since we want to write the index eventually, we cannot reuse the index * for these (temporary) data. */ -struct stage_data -{ - struct - { +struct stage_data { + struct { unsigned mode; unsigned char sha[20]; } stages[4]; @@ -403,8 +401,7 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o, } } -struct rename -{ +struct rename { struct diff_filepair *pair; struct stage_data *src_entry; struct stage_data *dst_entry; @@ -717,8 +714,7 @@ static void update_file(struct merge_options *o, /* Low level file merging, update and removal */ -struct merge_file_info -{ +struct merge_file_info { unsigned char sha[20]; unsigned mode; unsigned clean:1, |