diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-25 23:36:10 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-03 23:45:47 -0800 |
| commit | 5332b2af104180b8135e0b3528ace7596cb9ba09 (patch) | |
| tree | 4cfd5de96fa073f6fdf581b0f51e41a52e8787bd /diff-lib.c | |
| parent | ae792aa52bb0962079f500bd491363f2b48457b6 (diff) | |
| download | git-5332b2af104180b8135e0b3528ace7596cb9ba09.tar.gz git-5332b2af104180b8135e0b3528ace7596cb9ba09.tar.xz | |
diff: support reading a file from stdin via "-"
This allows you to say
echo Hello World | git diff x -
to compare the contents of file "x" with the line "Hello World".
This automatically switches to --no-index mode.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/diff-lib.c b/diff-lib.c index 88e59b579..226f09c72 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -37,14 +37,20 @@ static int queue_diff(struct diff_options *o, int mode1 = 0, mode2 = 0; if (name1) { - if (stat(name1, &st)) + if (!strcmp(name1, "-")) + mode1 = 0644; + else if (stat(name1, &st)) return error("Could not access '%s'", name1); - mode1 = st.st_mode; + else + mode1 = st.st_mode; } if (name2) { - if (stat(name2, &st)) + if (!strcmp(name2, "-")) + mode2 = 0644; + else if (stat(name2, &st)) return error("Could not access '%s'", name2); - mode2 = st.st_mode; + else + mode2 = st.st_mode; } if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) @@ -224,7 +230,7 @@ int setup_diff_no_index(struct rev_info *revs, { int i; for (i = 1; i < argc; i++) - if (argv[i][0] != '-') + if (argv[i][0] != '-' || argv[i][1] == '\0') break; else if (!strcmp(argv[i], "--")) { i++; |