Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 6, 2018, 18:30 UTC
- Message-ID
- <xmqqh8lckyih.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180704141635.GH24016@distanz.ch>
Tobias Klauser <tklauser@distanz.ch> writes:
Show 10 quoted lines
> And I'm glad to see that this part will be rewritten in C :-) > >> However, your patch also covers this: >> >> > git-rebase--preserve-merges.sh | 4 ++-- >> >> I completely missed that in the earlier patch. >> >> Junio, this gets an ACK from me, could you apply the >> `git-rebase--preserve-merges.sh` part selectively, please?
Here is what I assembled from various pieces in the list archive.
-- >8 -- Subject: [PATCH] git-rebase--preserve-merges: fix formatting of todo help message
Part of the todo help message in git-rebase--preserve-merges.sh is unnecessarily indented, making the message look weird. Remove the extra lines and trailing indent.
This was a minor regression introduced by d48f97aa ("rebase: reindent function git_rebase__interactive", 2018-03-23) in the 2.18 timeframe. The same issue exists in "rebase -i", but it is being addressed separately as part of the rewrite of the subcommand into C.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
git-rebase--preserve-merges.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh index c51c7828e7..c214c5e4d6 100644 --- a/git-rebase--preserve-merges.sh +++ b/git-rebase--preserve-merges.sh @@ -891,9 +891,9 @@ $comment_char $(eval_ngettext \ EOF append_todo_help gettext " - However, if you remove everything, the rebase will be aborted. +However, if you remove everything, the rebase will be aborted. - " | git stripspace --comment-lines >>"$todo" +" | git stripspace --comment-lines >>"$todo" if test -z "$keep_empty" then