diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2010-08-24 14:52:43 +1000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-24 10:46:14 -0700 |
| commit | eedce784a7492faa370fd96e372c948cba087965 (patch) | |
| tree | f8246b48f41c483c0b8ee8fdcbda9fa201389d95 /sha1_name.c | |
| parent | e6eedc31d5c3d448d000eecb678ce891a4800b54 (diff) | |
| download | git-eedce784a7492faa370fd96e372c948cba087965.tar.gz | |
sha1_name.c: use warning in preference to fprintf(stderr
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sha1_name.c b/sha1_name.c index 90ad430a86..13209dc5b8 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); |