From: Michele Ballabio <barra_cuda@katamail.com>
To: git <git@vger.kernel.org>
Subject: [PATCH] shortlog: do not stall when there is no input
Date: Wed, 24 Feb 2010 20:20:27 +0100 [thread overview]
Message-ID: <201002242020.27801.barra_cuda@katamail.com> (raw)
A simple "git shortlog" outside of a git repository used to stall
waiting for an input. Fix this by testing with isatty() before
calling read_from_stdin().
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
builtin-shortlog.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index b3b055f..ff5dca6 100644
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -294,9 +294,8 @@ parse_done:
/* assume HEAD if from a tty */
if (!nongit && !rev.pending.nr && isatty(0))
add_head_to_pending(&rev);
- if (rev.pending.nr == 0) {
+ if (rev.pending.nr == 0 && !isatty(0))
read_from_stdin(&log);
- }
else
get_from_rev(&rev, &log);
--
1.7.0
next reply other threads:[~2010-02-24 19:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-24 19:20 Michele Ballabio [this message]
2010-02-24 19:31 ` [PATCH] shortlog: do not stall when there is no input Junio C Hamano
2010-02-24 20:49 ` [PATCH] shortlog: warn the user " Michele Ballabio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201002242020.27801.barra_cuda@katamail.com \
--to=barra_cuda@katamail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).