From 4dfdbe10dc8ca02fff2d5f0ce181b45d39394d56 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 23 May 2005 16:42:21 -0700 Subject: [PATCH] git-apply: if no input files specified, apply stdin This makes it act more like a traditional UNIX thing (eg "cat"). --- apply.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apply.c b/apply.c index dbcc07d39..f3b686541 100644 --- a/apply.c +++ b/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; } -- 2.30.2