undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1_name.c: use warning in preference to fprintf(stderr

Browse Source 
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>
This commit is contained in:
Jon Seymour 2010-08-24 14:52:43 +10:00 committed by Junio C Hamano
parent e6eedc31d5
commit eedce784a7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sha1_name.c
View File

@ -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 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; char *real_ref = NULL;
int refs_found = 0; int refs_found = 0;
int at, reflog_len; int at, reflog_len;
@ -390,7 +390,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
return -1; return -1;
if (warn_ambiguous_refs && refs_found > 1) if (warn_ambiguous_refs && refs_found > 1)
fprintf(stderr, warning, len, str); warning(warn_msg, len, str);
if (reflog_len) { if (reflog_len) {
int nth, i; 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, if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
&co_time, &co_tz, &co_cnt)) { &co_time, &co_tz, &co_cnt)) {
if (at_time) if (at_time)
fprintf(stderr, warning("Log for '%.*s' only goes "
"warning: Log for '%.*s' only goes " "back to %s.", len, str,
"back to %s.\n", len, str,
show_date(co_time, co_tz, DATE_RFC2822)); show_date(co_time, co_tz, DATE_RFC2822));
else { else {
free(real_ref); free(real_ref);