summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-07 12:47:16 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-07 12:47:16 -0800
commit0d1f2a56b1f83a6d298e5c03bfe76a47caa753c2 (patch)
tree52916300f84a2b3df0a8330e231f6651ff5fcb84
parentMerge branch 'jk/maint-push-tracking-wo-remote' (diff)
parentshortlog: warn the user when there is no input (diff)
downloadtgif-0d1f2a56b1f83a6d298e5c03bfe76a47caa753c2.tar.xz
Merge branch 'mb/shortlog-nongit-stdin'
* mb/shortlog-nongit-stdin: shortlog: warn the user when there is no input
-rw-r--r--builtin-shortlog.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index ecd2d45a00..06320f5285 100644
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -295,6 +295,8 @@ parse_done:
if (!nongit && !rev.pending.nr && isatty(0))
add_head_to_pending(&rev);
if (rev.pending.nr == 0) {
+ if (isatty(0))
+ fprintf(stderr, "(reading log message from standard input)\n");
read_from_stdin(&log);
}
else