mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
git-apply: if no input files specified, apply stdin
This makes it act more like a traditional UNIX thing (eg "cat").
This commit is contained in:
parent
9ab55bd29a
commit
4dfdbe10dc
5
apply.c
5
apply.c
|
@ -509,6 +509,7 @@ static int apply_patch(int fd)
|
|||
int main(int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
int read_stdin = 1;
|
||||
|
||||
if (read_cache() < 0)
|
||||
die("unable to read index file");
|
||||
|
@ -519,6 +520,7 @@ int main(int argc, char **argv)
|
|||
|
||||
if (!strcmp(arg, "-")) {
|
||||
apply_patch(0);
|
||||
read_stdin = 0;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--no-merge")) {
|
||||
|
@ -528,8 +530,11 @@ int main(int argc, char **argv)
|
|||
fd = open(arg, O_RDONLY);
|
||||
if (fd < 0)
|
||||
usage(apply_usage);
|
||||
read_stdin = 0;
|
||||
apply_patch(fd);
|
||||
close(fd);
|
||||
}
|
||||
if (read_stdin)
|
||||
apply_patch(0);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue