mirror of
https://github.com/git/git.git
synced 2024-11-17 22:44:49 +01:00
Merge branch 'jc/grep' into next
* jc/grep: builtin-grep: printf %.*s length is int, not ptrdiff_t.
This commit is contained in:
commit
5d028406e5
1 changed files with 1 additions and 1 deletions
|
@ -103,7 +103,7 @@ static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
|
||||||
printf("%s%c", name, sign);
|
printf("%s%c", name, sign);
|
||||||
if (opt->linenum)
|
if (opt->linenum)
|
||||||
printf("%d%c", lno, sign);
|
printf("%d%c", lno, sign);
|
||||||
printf("%.*s\n", eol-bol, bol);
|
printf("%.*s\n", (int)(eol-bol), bol);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int grep_buffer(struct grep_opt *opt, const char *name,
|
static int grep_buffer(struct grep_opt *opt, const char *name,
|
||||||
|
|
Loading…
Reference in a new issue