Skip to content

Commit

Permalink
diff --no-index: die on error reading stdin
Browse files Browse the repository at this point in the history
If there is an error when reading from stdin then "diff --no-index"
prints an error message but continues to try and diff a file named "-"
resulting in an error message that looks like

    error: error while reading from stdin: Invalid argument
    fatal: stat '-': No such file or directory

assuming that no file named "-" exists. If such a file exists it prints
the first error message and generates the diff from that file which is
not what the user wanted. Instead just die() straight away if we cannot
read from stdin.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
phillipwood authored and gitster committed Jul 5, 2023
1 parent 4981984 commit 4e61e0f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions diff-no-index.c
Expand Up @@ -60,20 +60,19 @@ static int get_mode(const char *path, int *mode)
return 0;
}

static int populate_from_stdin(struct diff_filespec *s)
static void populate_from_stdin(struct diff_filespec *s)
{
struct strbuf buf = STRBUF_INIT;
size_t size = 0;

if (strbuf_read(&buf, 0, 0) < 0)
return error_errno("error while reading from stdin");
die_errno("error while reading from stdin");

s->should_munmap = 0;
s->data = strbuf_detach(&buf, &size);
s->size = size;
s->should_free = 1;
s->is_stdin = 1;
return 0;
}

static struct diff_filespec *noindex_filespec(const char *name, int mode)
Expand Down

0 comments on commit 4e61e0f

Please sign in to comment.