diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:47:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:47:04 -0700 |
| commit | 6b5005c88b3a0c360249deb8ca8b92201abaa824 (patch) | |
| tree | 177a02c572549b4caa5872ef3ecd4275e860b5af /diff-no-index.c | |
| parent | 165dc789d5e201a06e0de5a984e4529ae62027fc (diff) | |
| parent | 183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2 (diff) | |
| download | git-6b5005c88b3a0c360249deb8ca8b92201abaa824.tar.gz | |
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 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 43aeeba2e0..ce9e783407 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -64,7 +64,8 @@ static int queue_diff(struct diff_options *o, if (S_ISDIR(mode1) || S_ISDIR(mode2)) { char buffer1[PATH_MAX], buffer2[PATH_MAX]; - struct string_list p1 = {NULL, 0, 0, 1}, p2 = {NULL, 0, 0, 1}; + struct string_list p1 = STRING_LIST_INIT_DUP; + struct string_list p2 = STRING_LIST_INIT_DUP; int len1 = 0, len2 = 0, i1, i2, ret = 0; if (name1 && read_directory(name1, &p1)) |