Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
remote: trivial style cleanup
author
Felipe Contreras
<felipe.contreras@gmail.com>
Tue, 28 May 2013 12:54:27 +0000
(07:54 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 28 May 2013 16:03:00 +0000
(09:03 -0700)
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
remote.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
edca415
)
diff --git
a/remote.c
b/remote.c
index 68eb99bdf0ca3fedd02ab1bc93db7549b21b62d4..e71f66de25b6031bbe1ee94ab3770aacd15b46e0 100644
(file)
--- a/
remote.c
+++ b/
remote.c
@@
-1474,8
+1474,7
@@
struct branch *branch_get(const char *name)
ret->remote = remote_get(ret->remote_name);
if (ret->merge_nr) {
int i;
- ret->merge = xcalloc(sizeof(*ret->merge),
- ret->merge_nr);
+ ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
for (i = 0; i < ret->merge_nr; i++) {
ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
ret->merge[i]->src = xstrdup(ret->merge_name[i]);