From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, jrnieder@gmail.com,
Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v3 2/3] sha1_name.c: use warning in preference to fprintf(stderr
Date: Tue, 24 Aug 2010 14:52:43 +1000 [thread overview]
Message-ID: <1282625564-12752-3-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <20100824001454.GB17406@burratino>
This commit changes sha1_name.c to use warning instead of
fprintf(stderr).
Trailing newlines from message formats have been removed
since warning adds one itself.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
sha1_name.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 10a4efe..3b8aea2 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -342,7 +342,7 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1);
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
{
- static const char *warning = "warning: refname '%.*s' is ambiguous.\n";
+ static const char *warn_msg = "refname '%.*s' is ambiguous.";
char *real_ref = NULL;
int refs_found = 0;
int at, reflog_len;
@@ -390,7 +390,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
return -1;
if (warn_ambiguous_refs && refs_found > 1)
- fprintf(stderr, warning, len, str);
+ warning(warn_msg, len, str);
if (reflog_len) {
int nth, i;
@@ -426,9 +426,8 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
&co_time, &co_tz, &co_cnt)) {
if (at_time)
- fprintf(stderr,
- "warning: Log for '%.*s' only goes "
- "back to %s.\n", len, str,
+ warning("Log for '%.*s' only goes "
+ "back to %s.", len, str,
show_date(co_time, co_tz, DATE_RFC2822));
else {
free(real_ref);
--
1.7.2.1.100.gceecd
next prev parent reply other threads:[~2010-08-24 4:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-18 11:36 RFD: should git rev-parse exit with non-zero status if ref@{n} is not valid? Jon Seymour
2010-08-18 11:41 ` Jon Seymour
2010-08-18 20:50 ` Junio C Hamano
2010-08-18 23:02 ` Jon Seymour
2010-08-21 1:43 ` [PATCH 0/4] rev-parse: improve reporting of invalid log references Jon Seymour
2010-08-21 1:43 ` [PATCH 1/4] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-21 1:43 ` [PATCH 2/4] rev-parse: suppress duplicate log limit exceeded message Jon Seymour
2010-08-22 21:20 ` Junio C Hamano
2010-08-23 14:59 ` Jon Seymour
2010-08-23 16:33 ` Junio C Hamano
2010-08-23 23:11 ` [PATCH v2 0/2] rev-parse: strengthen validation of ref@{n} references Jon Seymour
2010-08-23 23:11 ` [PATCH v2 1/2] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-24 0:14 ` Jonathan Nieder
2010-08-24 4:52 ` [PATCH v3 0/3] rev-parse: strengthen validation of ref@{n} references Jon Seymour
2010-08-24 4:52 ` [PATCH v3 1/3] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-24 4:52 ` Jon Seymour [this message]
2010-08-24 4:52 ` [PATCH v3 3/3] rev-parse: tests git rev-parse --verify master@{n}, for various n Jon Seymour
2010-08-23 23:11 ` [PATCH v2 2/2] " Jon Seymour
2010-08-21 1:43 ` [PATCH 3/4] rev-parse: introduce get_sha1_gently Jon Seymour
2010-08-21 1:43 ` [PATCH 4/4] rev-parse: tests that git rev-parse --verify master@{n} Jon Seymour
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=1282625564-12752-3-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/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).