kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: fix numerous argument alignment issues 

Various refactorings throughout the code have left lots of alignment
issues that were driving me crazy; fix them.

Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2018-06-09 21:16:12 -07:00 committed by Junio C Hamano
parent 2d6bad918d
commit d90e759fd5
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge-recursive.c
View File

@ -2904,7 +2904,8 @@ static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
} }


static int read_oid_strbuf(struct merge_options *o, static int read_oid_strbuf(struct merge_options *o,
const struct object_id *oid, struct strbuf *dst) const struct object_id *oid,
struct strbuf *dst)
{ {
void *buf; void *buf;
enum object_type type; enum object_type type;