threads / patch / 49366

patchgit-rebase--interactive.sh: fix trailing spaces on empty $todo

Subject: [PATCH 0/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo

## tl;dr

3 messages between Sep 18, 2018 and Sep 20, 2018. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Shulhan· Sep 18, 2018, 13:44 UTC · lore

For someone who use editor that display trailing white spaces, issuing interactive rebase will print two empty lines at the end of rebase with the last line contains tab,

  #	However, if you remove everything, the rebase will be aborted.
  #
  #\t
  # Note that empty commits are commented out
The character "\t" in above example is white space tab.

The "make test" was run succesfully but I can't reproduce/test manually with non-empty $todo (I have no idea how to do it).

Shulhan (1):
  git-rebase--interactive.sh: fix trailing spaces on empty $todo
 git-rebase--interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-- 
2.19.0.446.g26223adc4
Shulhan· Sep 18, 2018, 13:44 UTC · re: Shulhan · lore

[PATCH 1/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo

When issuing interactive rebase, git will open a text editor with list of commits to rebase and documentation on how to edit it. At the end of documentation it display,

  #	However, if you remove everything, the rebase will be aborted.
  #
  #\t
  # Note that empty commits are commented out
The "\t" is white space tab.
This commit remove the empty tab at the last two line.
---
 git-rebase--interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to git-rebase--interactive.sh +1 −1
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 299ded213..0bf9eefad 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -224,7 +224,7 @@ EOF
 	gettext "
 	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.19.0.446.g26223adc4
Junio C Hamano· Sep 20, 2018, 14:12 UTC · re: Shulhan · lore

Re: [PATCH 0/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo

Shulhan <m.shulhan@gmail.com> writes:
Show 13 quoted lines
> For someone who use editor that display trailing white spaces, issuing
> interactive rebase will print two empty lines at the end of rebase with the
> last line contains tab,
>
>   #	However, if you remove everything, the rebase will be aborted.
>   #
>   #\t
>   # Note that empty commits are commented out
>
> The character "\t" in above example is white space tab.
>
> The "make test" was run succesfully but I can't reproduce/test manually with
> non-empty $todo (I have no idea how to do it).

While the issue may still be there, I think that the mid-term plan for the release after this cycle is to use the GSoC version of "rebase -i" that rewrites all the logic that produces the above in C, which has been cooking in 'pu', and hopefully we can see it or its reroll in 'next' soonish.

So please see if the issue is there, or if you find other new issues (as this is essentially an attempted faithful re-implementation), in the version on 'pu', and report/fix them in there if necessary.

Thanks.
Show 5 quoted lines
> Shulhan (1):
>   git-rebase--interactive.sh: fix trailing spaces on empty $todo
>
>  git-rebase--interactive.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

← back to recent threads