sequencer: strip bogus LF at end of error messages

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sequencer.c b/sequencer.c
index 894d12ad725c2f8cdbabbc87c7db558f5a872a4e..5ca9e93888b0cdf6720c33711c52e23854f4b32b 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -493,7 +493,7 @@ static int is_index_unchanged(void)
        struct commit *head_commit;
 
        if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL))
        struct commit *head_commit;
 
        if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL))

-               return error(_("could not resolve HEAD commit\n"));
+               return error(_("could not resolve HEAD commit"));

 
        head_commit = lookup_commit(&head_oid);
 
 
        head_commit = lookup_commit(&head_oid);
 


@@ -513,7 +513,7 @@ static int is_index_unchanged(void)
 
        if (!cache_tree_fully_valid(active_cache_tree))
                if (cache_tree_update(&the_index, 0))
 
        if (!cache_tree_fully_valid(active_cache_tree))
                if (cache_tree_update(&the_index, 0))

-                       return error(_("unable to update cache tree\n"));
+                       return error(_("unable to update cache tree"));

 
        return !oidcmp(&active_cache_tree->oid,
                       &head_commit->tree->object.oid);
 
        return !oidcmp(&active_cache_tree->oid,
                       &head_commit->tree->object.oid);


@@ -699,12 +699,12 @@ static int is_original_commit_empty(struct commit *commit)
        const struct object_id *ptree_oid;
 
        if (parse_commit(commit))
        const struct object_id *ptree_oid;
 
        if (parse_commit(commit))

-               return error(_("could not parse commit %s\n"),
+               return error(_("could not parse commit %s"),

                             oid_to_hex(&commit->object.oid));
        if (commit->parents) {
                struct commit *parent = commit->parents->item;
                if (parse_commit(parent))
                             oid_to_hex(&commit->object.oid));
        if (commit->parents) {
                struct commit *parent = commit->parents->item;
                if (parse_commit(parent))

-                       return error(_("could not parse parent commit %s\n"),
+                       return error(_("could not parse parent commit %s"),

                                oid_to_hex(&parent->object.oid));
                ptree_oid = &parent->tree->object.oid;
        } else {
                                oid_to_hex(&parent->object.oid));
                ptree_oid = &parent->tree->object.oid;
        } else {