global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 11:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jn/grep-open' into next

Browse Source 
* jn/grep-open:
This commit is contained in:
Junio C Hamano
2010-06-27 12:16:34 -07:00
parent b1e8b971e1 0c72cead84
commit 84c097686d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/grep.c
View File

@@ -564,7 +564,7 @@ static void append_path(struct grep_opt *opt, const void *data, size_t len)
if (len == 1 && *(const char *)data == '\0')
return;
string_list_append(xstrndup(data, len), path_list);
string_list_append(path_list, xstrndup(data, len));
}
static void run_pager(struct grep_opt *opt, const char *prefix)
@@ -1005,7 +1005,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
opt.null_following_name = 1;
opt.output_priv = &path_list;
opt.output = append_path;
string_list_append(show_in_pager, &path_list);
string_list_append(&path_list, show_in_pager);
use_threads = 0;
}
@@ -1080,7 +1080,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
strbuf_addf(&buf, "+/%s%s",
strcmp("less", pager) ? "" : "*",
opt.pattern_list->pattern);
string_list_append(buf.buf, &path_list);
string_list_append(&path_list, buf.buf);
strbuf_detach(&buf, NULL);
}
}