summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-02 13:53:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-02 13:53:35 -0700
commit2fa4fff4b9ba9998685c0b38cbadb49ac38734ce (patch)
treee82c022130c637a6892b11843e5a89178c032908 /contrib
parentMerge branch 'zj/diff-stat-smaller-num-columns' (diff)
parentremove blank filename in error message (diff)
downloadtgif-2fa4fff4b9ba9998685c0b38cbadb49ac38734ce.tar.xz
Merge branch 'pw/message-cleanup'
Many error/warning messages had extra trailing newlines that are unnecessary. By Pete Wyckoff * pw/message-cleanup: remove blank filename in error message remove superfluous newlines in error messages
Diffstat (limited to 'contrib')
-rw-r--r--contrib/examples/builtin-fetch--tool.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/examples/builtin-fetch--tool.c b/contrib/examples/builtin-fetch--tool.c
index 3140e405fa..0d54aa7061 100644
--- a/contrib/examples/builtin-fetch--tool.c
+++ b/contrib/examples/builtin-fetch--tool.c
@@ -518,7 +518,7 @@ int cmd_fetch__tool(int argc, const char **argv, const char *prefix)
filename = git_path("FETCH_HEAD");
fp = fopen(filename, "a");
if (!fp)
- return error("cannot open %s: %s\n", filename, strerror(errno));
+ return error("cannot open %s: %s", filename, strerror(errno));
result = append_fetch_head(fp, argv[2], argv[3],
argv[4], argv[5],
argv[6], !!argv[7][0],
@@ -536,7 +536,7 @@ int cmd_fetch__tool(int argc, const char **argv, const char *prefix)
filename = git_path("FETCH_HEAD");
fp = fopen(filename, "a");
if (!fp)
- return error("cannot open %s: %s\n", filename, strerror(errno));
+ return error("cannot open %s: %s", filename, strerror(errno));
result = fetch_native_store(fp, argv[2], argv[3], argv[4],
verbose, force);
fclose(fp);