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>
Johannes Schindelin committed
Dec 23, 2017 at 00:55 UTC
aee42e1f35ac85ef25ba81eb28e72d002f0649db
1 file changed
+4
-4
sequencer.c
+4
-4
@@ -493,7 +493,7 @@ static int is_index_unchanged(void)
493
struct commit *head_commit;
494
495
if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL))
496
- return error(_("could not resolve HEAD commit\n"));
496
+ return error(_("could not resolve HEAD commit"));
497
498
head_commit = lookup_commit(&head_oid);
499
@@ -513,7 +513,7 @@ static int is_index_unchanged(void)
513
514
if (!cache_tree_fully_valid(active_cache_tree))
515
if (cache_tree_update(&the_index, 0))
516
- return error(_("unable to update cache tree\n"));
516
+ return error(_("unable to update cache tree"));
517
518
return !oidcmp(&active_cache_tree->oid,
519
&head_commit->tree->object.oid);
@@ -699,12 +699,12 @@ static int is_original_commit_empty(struct commit *commit)
699
const struct object_id *ptree_oid;
700
701
if (parse_commit(commit))
702
- return error(_("could not parse commit %s\n"),
702
+ return error(_("could not parse commit %s"),
703
oid_to_hex(&commit->object.oid));
704
if (commit->parents) {
705
struct commit *parent = commit->parents->item;
706
if (parse_commit(parent))
707
- return error(_("could not parse parent commit %s\n"),
707
+ return error(_("could not parse parent commit %s"),
708
oid_to_hex(&parent->object.oid));
709
ptree_oid = &parent->tree->object.oid;
710
} else {