summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-05-28 12:54:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-28 16:03:00 (GMT)
commit7a97ee1d84283d0e59648531678bd69a895c78f5 (patch)
tree3bd9c5b829f6f74f55582c69f6ec465613c3b8ed /remote.c
parentedca4152560522a431a51fc0a06147fc680b5b18 (diff)
downloadgit-7a97ee1d84283d0e59648531678bd69a895c78f5.zip
git-7a97ee1d84283d0e59648531678bd69a895c78f5.tar.gz
git-7a97ee1d84283d0e59648531678bd69a895c78f5.tar.bz2
remote: trivial style cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/remote.c b/remote.c
index 68eb99b..e71f66d 100644
--- 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]);