global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-08 07:50:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pw/message-cleanup'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2012-05-02 13:53:35 -07:00
parent 29c2a3dbad 5eaeda70de
commit 2fa4fff4b9
15 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/branch.c
View File

@@ -663,7 +663,7 @@ static int edit_branch_description(const char *branch_name)
fp = fopen(git_path(edit_description), "w");
if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) {
strbuf_release(&buf);
return error(_("could not write branch description template: %s\n"),
return error(_("could not write branch description template: %s"),
strerror(errno));
}
strbuf_reset(&buf);

4
builtin/merge-file.c
View File

@@ -63,7 +63,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
if (quiet) {
if (!freopen("/dev/null", "w", stderr))
return error("failed to redirect stderr to /dev/null: "
"%s\n", strerror(errno));
"%s", strerror(errno));
}
if (prefix)
@@ -76,7 +76,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
if (read_mmfile(mmfs + i, fname))
return -1;
if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
return error("Cannot merge binary files: %s\n",
return error("Cannot merge binary files: %s",
argv[i]);
}

2
builtin/unpack-objects.c
View File

@@ -107,7 +107,7 @@ static void *get_data(unsigned long size)
if (stream.total_out == size && ret == Z_STREAM_END)
break;
if (ret != Z_OK) {
error("inflate returned %d\n", ret);
error("inflate returned %d", ret);
free(buf);
buf = NULL;
if (!recover)