mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tf/string-list-init'

Browse Source 
* tf/string-list-init:
  string_list: Add STRING_LIST_INIT macro and make use of it.
This commit is contained in:
Junio C Hamano
2010-08-18 12:47:04 -07:00
parent 165dc789d5 183113a5ca
commit 6b5005c88b
16 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/rerere.c
View File

@ -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) {