summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Alex Riesen <raa.lkml@gmail.com>2008-08-28 19:17:13 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-28 21:50:32 -0700
commitb9f62c0e7d60905d20de552280f91441300197c0 (patch)
treecbf11b3e7f5c93a9e76c60c19354d7ebfc6c3810
parentRemove calculation of the longest command name from where it is not used (diff)
downloadtgif-b9f62c0e7d60905d20de552280f91441300197c0.tar.xz
Remove useless memset of static command name lists in builtin-merge.c
The statics are always initialized with 0 Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-merge.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index dcd08f76b1..9ad9791068 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -93,8 +93,6 @@ static struct strategy *get_strategy(const char *name)
struct cmdnames not_strategies;
loaded = 1;
- memset(&main_cmds, 0, sizeof(struct cmdnames));
- memset(&other_cmds, 0, sizeof(struct cmdnames));
memset(&not_strategies, 0, sizeof(struct cmdnames));
load_command_list("git-merge-", &main_cmds, &other_cmds);
for (i = 0; i < main_cmds.cnt; i++) {