diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:53:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:53:35 -0700 |
| commit | 2fa4fff4b9ba9998685c0b38cbadb49ac38734ce (patch) | |
| tree | e82c022130c637a6892b11843e5a89178c032908 /builtin/merge-file.c | |
| parent | 29c2a3dbadaa1c2d1128a4892241f82f5b34778c (diff) | |
| parent | 5eaeda70de1e7763d070e8ccfbcd8ca10baea800 (diff) | |
| download | git-2fa4fff4b9ba9998685c0b38cbadb49ac38734ce.tar.gz git-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 'builtin/merge-file.c')
| -rw-r--r-- | builtin/merge-file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 237abd3c0..6f0efef43 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -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]); } |