diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-18 19:47:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 19:47:04 (GMT) |
| commit | 6b5005c88b3a0c360249deb8ca8b92201abaa824 (patch) | |
| tree | 177a02c572549b4caa5872ef3ecd4275e860b5af /builtin/rerere.c | |
| parent | 165dc789d5e201a06e0de5a984e4529ae62027fc (diff) | |
| parent | 183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2 (diff) | |
| download | git-6b5005c88b3a0c360249deb8ca8b92201abaa824.zip git-6b5005c88b3a0c360249deb8ca8b92201abaa824.tar.gz git-6b5005c88b3a0c360249deb8ca8b92201abaa824.tar.bz2 | |
Merge branch 'tf/string-list-init'
* tf/string-list-init:
string_list: Add STRING_LIST_INIT macro and make use of it.
Diffstat (limited to 'builtin/rerere.c')
| -rw-r--r-- | builtin/rerere.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c index 39ad601..9b1e3a7 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -40,7 +40,7 @@ static int git_rerere_gc_config(const char *var, const char *value, void *cb) static void garbage_collect(struct string_list *rr) { - struct string_list to_remove = { NULL, 0, 0, 1 }; + struct string_list to_remove = STRING_LIST_INIT_DUP; DIR *dir; struct dirent *e; int i, cutoff; @@ -102,7 +102,7 @@ static int diff_two(const char *file1, const char *label1, int cmd_rerere(int argc, const char **argv, const char *prefix) { - struct string_list merge_rr = { NULL, 0, 0, 1 }; + struct string_list merge_rr = STRING_LIST_INIT_DUP; int i, fd, flags = 0; if (2 < argc) { |