diff options
| author | Thiago Farina <tfransosi@gmail.com> | 2010-07-04 16:46:19 -0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-05 11:47:57 -0700 |
| commit | 183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2 (patch) | |
| tree | 2ab3a6f27ab3e8857cf3b5a825435f7bf6ed5b72 /merge-recursive.c | |
| parent | 8a57c6e9437eeebf849f0def03389078a510312e (diff) | |
| download | git-183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2.tar.gz git-183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2.tar.xz | |
string_list: Add STRING_LIST_INIT macro and make use of it.
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 856e98c08..1c065d306 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -806,7 +806,8 @@ static int process_renames(struct merge_options *o, struct string_list *b_renames) { int clean_merge = 1, i, j; - struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0}; + struct string_list a_by_dst = STRING_LIST_INIT_NODUP; + struct string_list b_by_dst = STRING_LIST_INIT_NODUP; const struct rename *sre; for (i = 0; i < a_renames->nr; i++) { |