aboutsummaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-04-29 20:28:45 -0400
committerJunio C Hamano <gitster@pobox.com>2012-04-30 15:45:51 -0700
commit82247e9bd5f7c90c4eac9674fb7518845cd3e432 (patch)
tree09fd8632c7e1ec214968eec58ded00184869646f /sha1_file.c
parent9768cafe681a7844d5a1d067991053b25db83bbb (diff)
downloadgit-82247e9bd5f7c90c4eac9674fb7518845cd3e432.tar.gz
git-82247e9bd5f7c90c4eac9674fb7518845cd3e432.tar.xz
remove superfluous newlines in error messages
The error handling routines add a newline. Remove the duplicate ones in error messages. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sha1_file.c b/sha1_file.c
index ad314f08b..c8d572d13 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2417,7 +2417,7 @@ int move_temp_to_file(const char *tmpfile, const char *filename)
unlink_or_warn(tmpfile);
if (ret) {
if (ret != EEXIST) {
- return error("unable to write sha1 filename %s: %s\n", filename, strerror(ret));
+ return error("unable to write sha1 filename %s: %s", filename, strerror(ret));
}
/* FIXME!!! Collision check here ? */
}
@@ -2509,9 +2509,9 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
fd = create_tmpfile(tmp_file, sizeof(tmp_file), filename);
if (fd < 0) {
if (errno == EACCES)
- return error("insufficient permission for adding an object to repository database %s\n", get_object_directory());
+ return error("insufficient permission for adding an object to repository database %s", get_object_directory());
else
- return error("unable to create temporary sha1 filename %s: %s\n", tmp_file, strerror(errno));
+ return error("unable to create temporary sha1 filename %s: %s", tmp_file, strerror(errno));
}
/* Set it up */