git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rebase -i: Fix white space in comments

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 26, 2018, 21:30 UTC
Message-ID
<nycvar.QRO.7.76.6.1806262329390.21419@tvgsbejvaqbjf.bet>
In-Reply-To
<614F0C12-7173-48BD-9212-71AD6FBBDAA7@dana.is>

Let's Cc: Wink, who authored the commit mentioned as culprit in the commit message.

On Tue, 26 Jun 2018, dana wrote:
Show 62 quoted lines
> Fix a trivial white-space issue introduced by commit d48f97aa8
> ("rebase: reindent function git_rebase__interactive", 2018-03-23). This
> affected the instructional comments displayed in the editor during an
> interactive rebase.
> 
> Signed-off-by: dana <dana@dana.is>
> ---
> 
> Sorry if i've done any of this wrong; i've never used this work-flow
> before. In any case, if it's not immediately obvious, this is the issue
> i mean to fix:
> 
> BEFORE (2.17.1):
> 
> # If you remove a line here THAT COMMIT WILL BE LOST.
> #
> # However, if you remove everything, the rebase will be aborted.
> #
> # Note that empty commits are commented out
> 
> AFTER (2.18.0):
> 
> # If you remove a line here THAT COMMIT WILL BE LOST.
> #
> #	However, if you remove everything, the rebase will be aborted.
> #
> #	
> # Note that empty commits are commented out
> 
> The 2.18.0 version is particularly irritating because many editors
> highlight the trailing tab in the penultimate line as a white-space
> error.
> 
> Aside: It's not a new thing, but i've always felt like that last line
> should end in a full stop. Maybe i'll send a patch for that too.
> 
> Cheers,
> dana
> 
>  git-rebase--interactive.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 299ded213..a31af6d4c 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -222,9 +222,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
> -- 
> 2.18.0
> 
> 
Previous: danaNext: Johannes Schindelin
Message 2 of 7 in “rebase -i: Fix white space in comments”
  1. rebase -i: Fix white space in commentsdana, Jun 26, 2018
  2. Johannes SchindelinJun 26, 2018
  3. Johannes SchindelinJun 26, 2018
  4. Johannes SchindelinJun 26, 2018
  5. danaJun 26, 2018
  6. Johannes SchindelinJun 27, 2018
  7. Wink SavilleJun 27, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.