Skip to content

Commit aee42e1

Browse files
dschogitster
authored andcommitted
sequencer: strip bogus LF at end of error messages
Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9336281 commit aee42e1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sequencer.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ static int is_index_unchanged(void)
493493
struct commit *head_commit;
494494

495495
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"));
497497

498498
head_commit = lookup_commit(&head_oid);
499499

@@ -513,7 +513,7 @@ static int is_index_unchanged(void)
513513

514514
if (!cache_tree_fully_valid(active_cache_tree))
515515
if (cache_tree_update(&the_index, 0))
516-
return error(_("unable to update cache tree\n"));
516+
return error(_("unable to update cache tree"));
517517

518518
return !oidcmp(&active_cache_tree->oid,
519519
&head_commit->tree->object.oid);
@@ -699,12 +699,12 @@ static int is_original_commit_empty(struct commit *commit)
699699
const struct object_id *ptree_oid;
700700

701701
if (parse_commit(commit))
702-
return error(_("could not parse commit %s\n"),
702+
return error(_("could not parse commit %s"),
703703
oid_to_hex(&commit->object.oid));
704704
if (commit->parents) {
705705
struct commit *parent = commit->parents->item;
706706
if (parse_commit(parent))
707-
return error(_("could not parse parent commit %s\n"),
707+
return error(_("could not parse parent commit %s"),
708708
oid_to_hex(&parent->object.oid));
709709
ptree_oid = &parent->tree->object.oid;
710710
} else {

0 commit comments

Comments
 (0)